From fe609c99cd295ac64aa76e31eee4ae21bb167302 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 30 九月 2021 09:11:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
index d66e68a..c75b9e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -119,6 +119,12 @@
     private Integer isHiddenDanger;
 
     /**
+     * 隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)
+     */
+    @ApiModelProperty("隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患),多条以逗号隔开")
+    private String hiddenDangerType;
+
+    /**
      * 隐患名称
      */
     @ApiModelProperty("隐患名称")
@@ -200,6 +206,15 @@
     }
 
     /**
+     * 巡查类型
+     */
+    public interface hiddenDangerType {
+        int huo = 1;
+        int xun = 2;
+        int yi = 3;
+    }
+
+    /**
      * 是否
      */
     public interface isOk {

--
Gitblit v1.7.1