From a834326805b2ca86c54437a22bb41a23eceace3f Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Fri, 10 Nov 2023 18:08:43 +0800 Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka --- src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java index eec9a62..fe7f3be 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java @@ -111,6 +111,9 @@ @TableField(exist = false) private String orderNo; + @TableField(exist = false) + private Integer hasCollect; + private Integer hasCarriage; private BigDecimal carriage; @@ -122,5 +125,16 @@ private BigDecimal carriageAmount; //运费模板ID private Long carriageRuleId; + //重量 + private BigDecimal goodsWeight; + //序号 + private Integer orderNumber; + private BigDecimal levelOnePrice; + private BigDecimal levelTwoPrice; + private BigDecimal levelThreePrice; + + + @TableField(exist = false) + private List<Long> couponIds; } -- Gitblit v1.9.1