From 5dc04f3291c00d66f8733a49896612ea1e3b31c5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 16 九月 2021 13:19:14 +0800
Subject: [PATCH] Merge branch 'test' into 'zzj'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
index 1646a23..607c13a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
@@ -58,6 +58,12 @@
     private String patrolType;
 
     /**
+     * 巡查领导id
+     */
+    @ApiModelProperty("巡查领导id")
+    private String patrolLeader;
+
+    /**
      * 巡查人员
      */
     @ApiModelProperty("巡查人员")
@@ -123,6 +129,37 @@
     private String personName;
 
     /**
+     * 接班领导id
+     */
+    @ApiModelProperty("接班领导id")
+    private String successionLeader;
+
+    /**
+     * 接班领导名字
+     */
+    @ApiModelProperty("接班领导名字")
+    private String successionLeaderName;
+
+    /**
+     * 接班人员id
+     */
+    @ApiModelProperty("接班人员id")
+    private String successionPerson;
+
+    /**
+     * 接班人员名字
+     */
+    @ApiModelProperty("接班人员名字")
+    private String successionPersonName;
+
+    /**
+     * 接班时间
+     */
+    @ApiModelProperty("接班时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date successionTime;
+
+    /**
      * 巡查类型
      */
     public interface patrolType {

--
Gitblit v1.7.1