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/MessageParam.java | 64 +++++++++---------------------- 1 files changed, 19 insertions(+), 45 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 82ae17b..7beeff7 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,9 @@ package com.ycl.dto.message; +import com.ycl.api.BasePageVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import javax.validation.constraints.NotNull; /** * <p> @@ -16,61 +15,36 @@ */ @Data @ApiModel("娑堟伅鍙傛暟浣�") -public class MessageParam { +public class MessageParam extends BasePageVO { + private Byte sort; /** * 鏍囬 */ @ApiModelProperty(value = "鏍囬") - @NotNull(message = "鏍囬涓虹┖") private String head; + /** + * 娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊 + */ + @ApiModelProperty(value = "娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊") + private String channelCode; + /** * 娑堟伅绫诲瀷 */ - @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊") - @NotNull(message = "娑堟伅绫诲瀷涓虹┖") + @ApiModelProperty(value = "濉厖鏍忕洰缂栫爜") private Integer messageType; - /** - * 娑堟伅浣� - */ - @ApiModelProperty(value = "娑堟伅浣�") - @NotNull(message = "娑堟伅浣撲负绌�") - private String body; - /** - * 鍙戦�佽�� - */ - @ApiModelProperty(value = "鍙戦�佽��") - @NotNull(message = "鍙戦�佽�呬负绌�") - private String targetFrom; - /** - * 鎺ユ敹鑰� - */ - @ApiModelProperty(value = "鎺ユ敹鑰�") - @NotNull(message = "鎺ユ敹鑰呬负绌�") - private String targetTo; - /** - * 闅忔満鐮� - */ - @ApiModelProperty(value = "闅忔満鐮�") - private String randomCode; - /** - * 鍙戦�佹椂闂� - */ - @ApiModelProperty(value = "鍙戦�佹椂闂�") - @NotNull(message = "鍙戦�佹椂闂翠负绌�") - private String sendTime; + + @ApiModelProperty(value = "寮�濮嬫椂闂�") + private String startTime; + + @ApiModelProperty(value = "寮�濮嬫椂闂�") + private String endTime; /** * 鐘舵��0-鏈彂甯�1-宸插彂甯� */ @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�") private Integer status; - /** - * 澶囨敞 - */ - @ApiModelProperty(value = "澶囨敞 ps:棰勭暀瀛楁") - private String remark; - /** - * 鍒涘缓浜� - */ - @ApiModelProperty(value = "鍒涘缓浜�") - private Long createUser; + + @ApiModelProperty(value = "鍝嶅簲缁撴灉") + private String respondResult; } \ No newline at end of file -- Gitblit v1.8.0