From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
index f58f938..2102ce6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
@@ -60,7 +60,7 @@
     @TableLogic
     private Integer delFlag;
 
-    @ApiModelProperty(value = "1是普通商品,2 团购商品,3 秒杀商品")
+    @ApiModelProperty(value = "1是普通商品,2秒杀商品,3 团购商品")
     private Integer type;
 
 }

--
Gitblit v1.7.1