From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
index 6b8121b..841b29d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
@@ -57,7 +57,7 @@
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
@@ -68,7 +68,7 @@
private String eventClazz;
@Max(127)
- @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
@NotNull(message = "危险级别不能为空")
private Integer dangerLevel;
--
Gitblit v1.7.1