From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-other/src/main/java/com/dsh/other/entity/HonorRules.java |    9 +++++++--
 1 files changed, 7 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 a098a05..a6061d5 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;
@@ -32,16 +34,19 @@
     /**
      * 数据类型(1=俱乐部之星,2=运动达人,3=社区之王,4=深度玩家)
      */
+    @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