From a899a229a54932495097bdfb2655822d06f8dbe1 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 31 十月 2022 15:15:34 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 be32721..26fcbea 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
@@ -1,12 +1,8 @@
package com.panzhihua.common.model.dtos.partybuilding;
-import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,16 +13,16 @@
@Data
@ApiModel("分页查询团队成员")
public class PageComPbServiceTeamDTO {
- @ApiModelProperty(value = "分页-当前页数",example = "1",required = true)
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
private Long pageNum;
- @ApiModelProperty(value = "分页-每页记录数",example = "10",required = true)
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
private Long pageSize;
@ApiModelProperty("姓名")
private String name;
- @ApiModelProperty(value = "社区id",hidden = true)
+ @ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
@ApiModelProperty("照片")
private String url;
@@ -37,5 +33,9 @@
@ApiModelProperty("电话")
private String phone;
@ApiModelProperty("是否注册")
- private Integer isReg;
+ private Integer isReg;
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Long streetId;
+ @ApiModelProperty("关键字")
+ private String keyword;
}
--
Gitblit v1.7.1