From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +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/civil/PageComActSocialWorkerDTO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
index 2999957..acd6b0b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
@@ -130,4 +130,16 @@
     @ApiModelProperty(value = "是否证件 0否 1是")
     private Integer credential;
 
+    @ApiModelProperty(value = "关键字搜索")
+    private String keyword;
+
+    @ApiModelProperty(value = "年龄开始")
+    private Integer ageBegin;
+
+    @ApiModelProperty(value = "年龄结束")
+    private Integer ageEnd;
+
+    @ApiModelProperty("活动id")
+    private Long activityId;
+
 }
\ No newline at end of file

--
Gitblit v1.7.1