From ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期五, 27 九月 2024 16:26:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java b/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java index 8ea8905..552626b 100644 --- a/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java +++ b/src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java @@ -54,6 +54,9 @@ @TableField("fee_platform_transport") private BigDecimal feePlatformTransport;//物流扣款 + @TableField("fee_packing_transport") + private BigDecimal feePackingTransport;//打包运费 + @TableField("total_fee") private BigDecimal totalFee;//退款总额 @@ -69,4 +72,6 @@ @TableField("refund_id") private String refundId;//退款id + private String salesType;//售后类型 + } -- Gitblit v1.9.3