From 5513e69c82a82eb6be786d5cb8e23b81bffc8636 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 10 八月 2021 09:55:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
index 6680eb2..60ecfd3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
@@ -38,6 +38,12 @@
     private Long communityId;
 
     /**
+     * 社区id
+     */
+    @ApiModelProperty("社区名称")
+    private String communityName;
+
+    /**
      * 巡查时间
      */
     @ApiModelProperty("巡查时间")
@@ -101,7 +107,7 @@
     * 隐患名称
     */
     @ApiModelProperty("隐患名称")
-    private String dagerName;
+    private String dangerName;
 
     /**
     * 排查时间
@@ -211,6 +217,9 @@
     @ApiModelProperty("指派人员")
     private String assignPerson;
 
+    @ApiModelProperty("指派人员名称")
+    private String assignPersonName;
+
     /**
     * 创建时间
     */
@@ -231,12 +240,21 @@
     @ApiModelProperty("创建人")
     private Long createBy;
 
+    @ApiModelProperty("创建人姓名")
+    private String createName;
+
+    @ApiModelProperty("巡查人姓名")
+    private String personName;
+
     /**
      * 是否指派
      */
     @ApiModelProperty("是否指派(1.是 0.否)")
     private Integer isAssign;
 
+    @ApiModelProperty("巡查人员名称")
+    private String patrolName;
+
 
 
     /**

--
Gitblit v1.7.1