From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:58:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java
index 310803e..4609dbf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java
@@ -51,9 +51,67 @@
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    /**
+     *居民姓名
+     */
+    @ApiModelProperty("居民姓名")
+    private String name;
+
+    /**
+     * 报警处理状态 0待处理 1已办结
+     */
+    @ApiModelProperty("处理状态")
+    private Integer status;
+
+    /**
+     * 处理人id
+     */
+    @ApiModelProperty("处理人id")
+    private Long solveId;
+
+    /**
+     * 处理时间
+     */
+    @ApiModelProperty(value = "处理时间")
+    private Date solveTime;
+
+    /**
+     * 处理内容
+     */
+    @ApiModelProperty(value = "处理内容")
+    private String solveContent;
+
+    /**
+     * 社区id
+     */
+    @ApiModelProperty(value = "社区id")
+    private Long communityId;
+
+    /**
+     * 处理图片
+     */
+    @ApiModelProperty("处理图片")
+    private String solveUrl;
+    /**
+     * 报警类型 1一键报警 2长时间无应答报警
+     */
     public interface  type{
         int one=1;
         int time=2;
     }
+    /**
+     * 报警处理状态 0待处理 1已办结
+     */
+    public interface  status{
+        int dcl=0;
+        int ybj=1;
+    }
+
 
 }

--
Gitblit v1.7.1