Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 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;

}