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/dto/message/MessageColumnParam.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
index 0ee5c76..ae104a9 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java
@@ -1,11 +1,11 @@
 package com.ycl.dto.message;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.ycl.api.BasePageVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 
 /**
  * <p>
@@ -17,29 +17,27 @@
  */
 @Data
 @ApiModel("娑堟伅鏍忕洰鍙傛暟浣�")
-public class MessageColumnParam {
+public class MessageColumnParam extends BasePageVO {
     private static final long serialVersionUID = 1L;
 
     /**
      * 鏍忕洰鍚嶇О
      */
     @ApiModelProperty(value = "鏍忕洰鍚嶇О")
-    @NotNull(message = "鏍忕洰鍚嶇О涓虹┖")
+    @NotEmpty(message = "鏍忕洰鍚嶇О涓虹┖")
     private String columnName;
 
     /**
      * 鎻忚堪
      */
-    @TableField("desc")
     @ApiModelProperty(value = "鎻忚堪")
-    private String desc;
+    private String description;
 
     /**
      * 鏄惁鏄剧ず
      */
-    @TableField("is_show")
     @ApiModelProperty(value = "鏄惁鏄剧ず")
-    private String isShow;
+    private Integer isShow;
 
     /**
      * 鍒涘缓浜�

--
Gitblit v1.8.0