From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
index 4ba2973..f08e4dc 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java
@@ -10,7 +10,6 @@
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -48,7 +47,7 @@
*/
@TableField("column_number")
@ApiModelProperty(value = "鏍忕洰缂栫爜")
- @NotBlank(message = "娓犻亾鐮佷负绌�")
+ @NotBlank(message = "鏍忕洰缂栫爜涓虹┖")
private String columnNumber;
/**
@@ -56,22 +55,21 @@
*/
@TableField("notice_amount")
@ApiModelProperty(value = "鍏憡鏁�")
- private Integer notice_amount;
+ private Integer noticeAmount;
/**
* 鏄惁鏄剧ず
*/
@TableField("is_show")
@ApiModelProperty(value = "鏄惁鏄剧ず")
- @NotNull(message = "鏄惁鏄剧ず涓虹┖")
- private String isShow;
+ private Integer isShow;
/**
* 鎻忚堪
*/
- @TableField("desc")
+ @TableField("description")
@ApiModelProperty(value = "鎻忚堪")
- private String desc;
+ private String description;
/**
* 鍒涘缓浜�
--
Gitblit v1.8.0