From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期二, 08 十月 2024 17:13:27 +0800 Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3 --- 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