From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 09 一月 2023 17:26:18 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java index bf1c3ee..33b7dfd 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java @@ -1,5 +1,8 @@ package com.ycl.dto.casePool; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ycl.dto.caseHandler.DispatchInfoParam; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -7,13 +10,12 @@ import javax.validation.constraints.NotNull; @Data +@ApiModel(value = "娣诲姞杩濊妗堜欢") public class ViolationParam { - /** - * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛� - */ - @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓") - @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�") - private Integer category; + + + @ApiModelProperty(value = "鐘舵��") + private Integer state; /** * 澶х被 @@ -21,6 +23,18 @@ @ApiModelProperty(value = "澶х被") @NotNull(message = "涓嶅厑璁稿ぇ绫讳负绌�") private Integer categoryId; + + /** + * 鎶ヨ鏃堕棿 + */ + @TableField("alarm_time") + private String alarmTime; + + /** + * 璋冨害鏃堕檺 + */ + @TableField("limit_time") + private String limitTime; /** * 灏忕被 @@ -76,7 +90,7 @@ * 鍏宠仈鍟嗛摵鍚嶇О */ @ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О") - private String shopName; + private Integer shopName; /** * 杞︾墝鍙� -- Gitblit v1.8.0