From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
index 7d9e296..7dc3d35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
@@ -19,12 +19,32 @@
     @ApiModelProperty("邻里圈图片url")
     private String releaseImages;
 
-    @ApiModelProperty(value = "用户id",hidden = true)
+    @ApiModelProperty("邻里圈话题id")
+    private Long topicId;
+
+    @ApiModelProperty(value = "用户id", hidden = true)
     private Long userId;
 
-    @ApiModelProperty(value = "发布人电话",hidden = true)
+    @ApiModelProperty(value = "发布人电话", hidden = true)
     private String phone;
 
-    @ApiModelProperty(value = "社区id",hidden = true)
+    @ApiModelProperty(value = "社区id", hidden = true)
     private Long communityId;
+
+    @ApiModelProperty(value = "是否需要审核(1.是 2.否)",hidden = true)
+    private Integer isExamine;
+
+    @ApiModelProperty(value = "微信审核结果(1.通过 2.拒绝)",hidden = true)
+    private Integer wxExamineResult;
+
+    @ApiModelProperty("用户新增邻里圈话题")
+    private String topicName;
+
+    /**
+     * 是否需要审核(1.是 2.否)
+     */
+    public interface isExamine{
+        int yes = 1;
+        int no = 2;
+    }
 }

--
Gitblit v1.7.1