From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:42:58 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 6b09192..29c4901 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -15,7 +16,6 @@
* <p>
* 荣誉规则
* </p>
- *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -31,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;
@@ -39,13 +39,13 @@
* 等级
*/
@TableField("level")
- private String level;
+ private Integer level;
/**
* 满足条件值
*/
- @TableField("condition")
- private String condition;
+ @TableField(value = "`condition`")
+ private Integer condition;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1