From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
index ac1168f..6c24e02 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -34,4 +34,34 @@
     @ApiModelProperty("关键词")
     private String keyWord;
 
+    @ApiModelProperty("使用类型(1.邻里圈 2.问题清单 3.需求清单)")
+    private Integer belongType;
+
+    @ApiModelProperty(value = "处理状态 0 否 1是", example = "1")
+    private Integer solveStatus;
+
+    @ApiModelProperty(value = "接单人id", example = "1")
+    private Long solveId;
+
+    @ApiModelProperty(value = "查看求助列表 默认传1")
+    private Integer isHelp;
+
+    private String phone;
+
+    @ApiModelProperty("接单类型 1单位 2个人")
+    private Integer orderType;
+    @ApiModelProperty("清单状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "单位id", hidden = true)
+    private Long checkUnitId;
+    /**
+     * 使用类型(1.邻里圈 2.问题清单 3.需求清单)
+     */
+    public interface BelongType{
+        int LLQ = 1;
+        int WTQD = 2;
+        int XQQD = 3;
+    }
+
 }

--
Gitblit v1.7.1