From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'blnka-vip' 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