From ead65cd9b15cd574f4e37c3376c7447efea53935 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

---
 src/main/java/com/mzl/flower/entity/flower/Flower.java |    4 +++-
 1 files changed, 3 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..2728d88 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,7 @@
     @TableField("recommend_rank")
     private Integer recommendRank;//推荐排序
 
+    @TableField("type_rank")
+    private Integer typeRank;//同类排序
+
 }
\ No newline at end of file

--
Gitblit v1.9.3