From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
index faf20ad..b04379e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
@@ -34,4 +34,12 @@
     private String phone;
     @ApiModelProperty("是否注册")
     private Integer isReg;
+    @ApiModelProperty(value = "街道id", hidden = true)
+    private Long streetId;
+    @ApiModelProperty("关键字")
+    private String keyword;
+    @ApiModelProperty("物业公司id")
+    private Long propertyId;
+    @ApiModelProperty("1是社区团队 2党员先锋")
+    private Integer type;
 }

--
Gitblit v1.7.1