From c7450a8e1724528046af3683d49eaf0a06785130 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 14:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
index b5bba68..40bd988 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java
@@ -41,7 +41,7 @@
     private String dangerType;
 
     /**
-    * 状态(1.待查看 2.待处理 3.待整改 4.已整改)
+    * 状态(1.待处理 2.待整改 3.已整改)
     */
     private String status;
 
@@ -106,6 +106,16 @@
     private String undertakeRecord;
 
     /**
+     * 领导意见
+     */
+    private String leaderSuggestion;
+
+    /**
+     * 指派人员
+     */
+    private String assignPerson;
+
+    /**
     * 备注
     */
     private String remark;

--
Gitblit v1.7.1