From 1b9b482e6c55f043a586665b84d2d0feb8daa397 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 15 九月 2021 14:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
index 4047775..e42cfa7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
@@ -28,7 +28,63 @@
      */
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-
+    /**
+     * 位置信息
+     */
     @ApiModelProperty(value = "位置信息")
     private String position;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    /**
+     *居民姓名
+     */
+    @ApiModelProperty("居民姓名")
+    private String name;
+
+    /**
+     * 报警处理状态 0待处理 1已办结
+     */
+    @ApiModelProperty("处理状态")
+    private Integer status;
+
+    /**
+     * 处理人
+     */
+    @ApiModelProperty("处理人")
+    private String solveName;
+
+    /**
+     * 处理时间
+     */
+    @ApiModelProperty(value = "处理时间")
+    private Date solveTime;
+
+    /**
+     * 处理内容
+     */
+    @ApiModelProperty(value = "处理内容")
+    private String solveContent;
+
+    /**
+     * 处理人id
+     */
+    @ApiModelProperty("处理人id")
+    private Long solveId;
+
+    /**
+     * 社区id
+     */
+    @ApiModelProperty("社区id")
+    private Long communityId;
+
+    /**
+     * 处理图片
+     */
+    @ApiModelProperty("处理图片")
+    private String solveUrl;
 }

--
Gitblit v1.7.1