From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 十二月 2023 14:59:32 +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 | 8 ++++---- 1 files changed, 4 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 6b09192..6e054e3 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) @@ -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