Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java

@@ -139,4 +139,7 @@
    @ApiModelProperty(value = "年龄结束")
    private Integer ageEnd;

    @ApiModelProperty("活动id")
    private Long activityId;

}