Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-27 8f4269c38cbb60fc18372a7ce83cdcc2e78205f3

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

@@ -109,4 +109,6 @@
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    private Integer age;

}