From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 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 3966a9c..e99f8e6 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,46 +1,70 @@
 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;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
+@ApiModel(value = "娣诲姞杩濊妗堜欢")
 public class ViolationParam {
-    /**
-     * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
-     */
-    @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓")
-    @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�")
-    private Integer category;
+
+
+    @ApiModelProperty(value = "鐘舵��")
+    private Integer state;
 
     /**
      * 澶х被
      */
     @ApiModelProperty(value = "澶х被")
-    @NotNull(message = "涓嶅厑璁稿ぇ绫讳负绌�")
+//    @NotNull(message = "涓嶅厑璁稿ぇ绫讳负绌�")
     private Integer categoryId;
+
+    /**
+     * 鎶ヨ鏃堕棿
+     */
+    @ApiModelProperty(value = "鎶ヨ鏃堕棿")
+    @TableField("alarm_time")
+    private String alarmTime;
+
+    /**
+     * 璋冨害鏃堕檺
+     */
+    @ApiModelProperty(value = "璋冨害鏃堕檺")
+    @TableField("limit_time")
+    private String limitTime;
 
     /**
      * 灏忕被
      */
     @ApiModelProperty(value = "灏忕被")
-    @NotNull(message = "涓嶅厑璁稿皬绫讳负绌�")
+//    @NotNull(message = "涓嶅厑璁稿皬绫讳负绌�")
     private Integer typeId;
+
+    /**
+     * 妗堜欢绛夌骇
+     */
+    @ApiModelProperty(value = "妗堜欢绛夌骇")
+//    @NotNull(message = "涓嶅厑璁告浠剁瓑绾т负绌�")
+    private Long gradeId;
 
     /**
      * 鎵�灞炶閬�
      */
     @ApiModelProperty(value = "鎵�灞炶閬�")
-    @NotNull(message = "涓嶅厑璁告墍灞炶閬撲负绌�")
+//    @NotNull(message = "涓嶅厑璁告墍灞炶閬撲负绌�")
     private Integer streetId;
 
     /**
      * 鎵�灞炵ぞ鍖�
      */
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
-    @NotBlank(message = "涓嶅厑璁告墍灞炵ぞ鍖轰负绌�")
+//    @NotNull(message = "涓嶅厑璁告墍灞炵ぞ鍖轰负绌�")
     private Integer communityId;
 
 
@@ -48,7 +72,7 @@
      * 妗堢敱
      */
     @ApiModelProperty(value = "妗堢敱")
-    @NotBlank(message = "涓嶅厑璁告鐢变负绌�")
+//    @NotBlank(message = "涓嶅厑璁告鐢变负绌�")
     private String actionCause;
 
 
@@ -69,7 +93,7 @@
      * 鍏宠仈鍟嗛摵鍚嶇О
      */
     @ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О")
-    private String shopName;
+    private Integer shopName;
 
     /**
      * 杞︾墝鍙�
@@ -101,4 +125,10 @@
      */
     @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     private String informantIdCard;
+
+    @ApiModelProperty(value = "鍥剧墖")
+    private List<String> imageUrls;
+
+    @ApiModelProperty(value = "瑙嗛")
+    private List<String> videoUrls;
 }

--
Gitblit v1.8.0