From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java b/cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java
index a6061d5..4c00f7e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java
@@ -16,7 +16,6 @@
  * <p>
  * 荣誉规则
  * </p>
- *
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,7 +31,7 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
-     * 数据类型(1=俱乐部之星,2=运动达人,3=社区之王,4=深度玩家)
+     * 数据类型(1=俱乐部之星,2=运动达人,3=社区之王,4=深度玩家,5=常胜将军,6=越战越勇)
      */
     @TableField("type")
     private Integer type;

--
Gitblit v1.7.1