From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'

---
 src/main/java/com/mzl/flower/entity/flower/Flower.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/flower/Flower.java b/src/main/java/com/mzl/flower/entity/flower/Flower.java
index 6519511..82593d3 100644
--- a/src/main/java/com/mzl/flower/entity/flower/Flower.java
+++ b/src/main/java/com/mzl/flower/entity/flower/Flower.java
@@ -3,7 +3,6 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mzl.flower.base.BaseAutoEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -76,4 +75,10 @@
     @TableField("recommend_rank")
     private Integer recommendRank;//推荐排序
 
+    @TableField("type_rank")
+    private Integer typeRank;//同类排序
+
+    @TableField("limited")
+    private Integer limited;//限购数量
+
 }
\ No newline at end of file

--
Gitblit v1.9.3