Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

 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;

}