From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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..25557c3 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,7 @@
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -25,7 +25,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("ums_message_column")
 @ApiModel(value = "娑堟伅鏍忕洰琛�")
-public class MessageColumn {
+public class MessageColumn implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 涓婚敭
@@ -48,7 +48,7 @@
      */
     @TableField("column_number")
     @ApiModelProperty(value = "鏍忕洰缂栫爜")
-    @NotBlank(message = "娓犻亾鐮佷负绌�")
+    @NotBlank(message = "鏍忕洰缂栫爜涓虹┖")
     private String columnNumber;
 
     /**
@@ -56,22 +56,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