From 6c0af7790f972e8a186a88d67e408498903d9eeb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
index b36c017..c76a2b2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
@@ -41,13 +41,13 @@
      * 巡查人员
      */
     @ExcelProperty(value = "巡查人员" ,index = 4)
-    private String patrolPerson;
+    private String personName;
 
     /**
      * 联系电话
      */
     @ExcelProperty(value = "联系电话" ,index = 5)
-    private String patrolPersonPhone;
+    private String personPhone;
 
     /**
      * 备注

--
Gitblit v1.7.1