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/AddComActNeighborCircleAppDTO.java | 8 +++++---
1 files changed, 5 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 c14e2fc..e9c8fad 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
@@ -37,12 +37,14 @@
@ApiModelProperty(value = "微信审核结果(1.通过 2.拒绝)",hidden = true)
private Integer wxExamineResult;
- @ApiModelProperty("用户新增邻里圈话题")
- private String topicName;
-
@ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
private Integer belongType;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+
+ private String topicName;
+
/**
* 使用类型（1.邻里圈 2.问题清单 3.需求清单）
*/
--
Gitblit v1.7.1