From c85b23cb867d4a0cebf2f22f3dd3211566cde2ea Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 10:26:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a098a05..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
@@ -1,9 +1,11 @@
package com.dsh.other.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -14,7 +16,6 @@
* <p>
* 荣誉规则
* </p>
- *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -30,18 +31,21 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 数据类型（1=俱乐部之星，2=运动达人，3=社区之王，4=深度玩家）
+ * 数据类型（1=俱乐部之星，2=运动达人，3=社区之王，4=深度玩家，5=赢家，6=次数）
*/
+ @TableField("type")
private Integer type;
/**
* 等级
*/
- private String level;
+ @TableField("level")
+ private Integer level;
/**
* 满足条件值
*/
- private String condition;
+ @TableField(value = "`condition`")
+ private Integer condition;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1