diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index c5f717d51..f24945e82 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3904,7 +3904,6 @@ CREATE TABLE `store_sale_detail` `discounted_price` decimal(10, 2) UNSIGNED NULL DEFAULT NULL COMMENT '给客户优惠后单价', `quantity` int NOT NULL COMMENT '数量', `amount` decimal(10, 2) NOT NULL COMMENT '总金额', - `other_discount` decimal(10, 2) UNSIGNED NULL DEFAULT NULL COMMENT '其它优惠', `color_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '颜色', `size` int UNSIGNED NULL DEFAULT NULL COMMENT '尺码', `sn` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条码', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java index 75648cebd..ed8e685ab 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java @@ -96,11 +96,6 @@ public class StoreSaleDetail extends XktBaseEntity { */ @Excel(name = "总金额") private BigDecimal amount; - /** - * 其它优惠 - */ - @Excel(name = "其它优惠") - private BigDecimal otherDiscount; /** * 条码 */ @@ -124,7 +119,6 @@ public class StoreSaleDetail extends XktBaseEntity { .append("discountedPrice", getDiscountedPrice()) .append("quantity", getQuantity()) .append("amount", getAmount()) - .append("otherDiscount", getOtherDiscount()) .append("version", getVersion()) .append("delFlag", getDelFlag()) .append("createBy", getCreateBy())