From 3a505ba8b2b27b16e355087c0b109b048f8c03a3 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 19 十月 2022 13:33:17 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java
index 30bcd5b..bc08106 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java
@@ -131,6 +131,45 @@
      */
     private Integer isDel;
 
+    /**
+     * 使用类型(1.邻里圈 2.问题清单 3.需求清单)
+     */
+    private Integer belongType;
+
+    private Integer solveStatus;
+
+    private Integer orderStatus;
+
+    private Long solveId;
+
+    private String solveContent;
+
+    private String solveUrl;
+
+    private Date orderTime;
+
+    private Date solveTime;
+
+    private Date commentTime;
+
+    private String comment;
+
+    private Integer orderType;
+
+    private Integer helpMemberType;
+
+    private String helpMemberContent;
+
+    private Integer helpOrgType;
+
+    private String helpOrgContent;
+
+    private Long solveUnitId;
+
+    private String realServiceTime;
+
+    private String targetServiceTime;
+
     @Override
     public String toString() {
         return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone

--
Gitblit v1.7.1