From 2f8f2ca5673a5a0547349d971f8a0d8c3c34c266 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 19 Sep 2025 15:10:15 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=BF=94=E5=8D=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8E=BB=E6=8E=89=E5=85=B6=E5=AE=83=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20240629.sql | 1 - .../java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index f24945e82..e12174538 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3963,7 +3963,6 @@ CREATE TABLE `store_sale_refund_record_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 '其它优惠', `sns` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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 '尺码', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java index 3cc7ec439..da0ce25c7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java @@ -88,8 +88,6 @@ public class StoreSaleRefundRecordDetail extends XktBaseEntity { /** * 其它优惠 */ - @Excel(name = "其它优惠") - private BigDecimal otherDiscount; /** * 条码 */ @@ -108,7 +106,6 @@ public class StoreSaleRefundRecordDetail extends XktBaseEntity { .append("discountedPrice", getDiscountedPrice()) .append("quantity", getQuantity()) .append("amount", getAmount()) - .append("otherDiscount", getOtherDiscount()) .append("version", getVersion()) .append("delFlag", getDelFlag()) .append("createBy", getCreateBy())