From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 fc67d3e..6a98d88 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,17 +1,21 @@
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.time.LocalDateTime;
@Data
@ApiModel(value = "娣诲姞杩濊妗堜欢")
public class ViolationParam {
+
+
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer state;
/**
* 澶х被
@@ -24,7 +28,13 @@
* 鎶ヨ鏃堕棿
*/
@TableField("alarm_time")
- private LocalDateTime alarmTime;
+ private String alarmTime;
+
+ /**
+ * 璋冨害鏃堕檺
+ */
+ @TableField("limit_time")
+ private String limitTime;
/**
* 灏忕被
@@ -38,7 +48,7 @@
*/
@ApiModelProperty(value = "妗堜欢绛夌骇")
@NotNull(message = "涓嶅厑璁告浠剁瓑绾т负绌�")
- private Integer gradeId;
+ private Long gradeId;
/**
* 鎵�灞炶閬�
@@ -80,7 +90,7 @@
* 鍏宠仈鍟嗛摵鍚嶇О
*/
@ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О")
- private String shopName;
+ private Integer shopName;
/**
* 杞︾墝鍙�
--
Gitblit v1.8.0