From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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/MessageParam.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
index bef1d13..806cc20 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
@@ -1,10 +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.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -17,19 +18,26 @@
  */
 @Data
 @ApiModel("娑堟伅鍙傛暟浣�")
-public class MessageParam {
+public class MessageParam extends BasePageVO {
     /**
      * 鏍囬
      */
     @ApiModelProperty(value = "鏍囬")
-    @NotBlank(message = "鏍囬涓虹┖")
+    @NotNull(message = "鏍囬涓虹┖")
     private String head;
+    /**
+     * 娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊
+     */
+    @TableField("channel_code")
+    @ApiModelProperty(value = "娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊")
+    @NotNull(message = "娓犻亾鐮佷负绌�")
+    private String channelCode;
     /**
      * 娑堟伅绫诲瀷
      */
-    @ApiModelProperty(value = "娑堟伅绫诲瀷")
-    @NotBlank(message = "娑堟伅绫诲瀷涓虹┖")
-    private Long messageType;
+    @ApiModelProperty(value = "濉厖鏍忕洰缂栫爜", required = true)
+    @NotNull(message = "娑堟伅绫诲瀷涓虹┖")
+    private Integer messageType;
     /**
      * 娑堟伅浣�
      */
@@ -46,7 +54,7 @@
      * 鎺ユ敹鑰�
      */
     @ApiModelProperty(value = "鎺ユ敹鑰�")
-    @NotBlank(message = "鎺ユ敹鑰呬负绌�")
+    @NotNull(message = "鎺ユ敹鑰呬负绌�")
     private String targetTo;
     /**
      * 闅忔満鐮�
@@ -57,7 +65,7 @@
      * 鍙戦�佹椂闂�
      */
     @ApiModelProperty(value = "鍙戦�佹椂闂�")
-    @NotBlank(message = "鍙戦�佹椂闂翠负绌�")
+    @NotNull(message = "鍙戦�佹椂闂翠负绌�")
     private String sendTime;
     /**
      * 鐘舵��0-鏈彂甯�1-宸插彂甯�

--
Gitblit v1.8.0