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

张天森

2022-11-08 947d016e4bd349b78d540e3a869f55d68b2c610c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java

@@ -63,7 +63,7 @@
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;
    private String skillType;

    /**
     * 入职时间
@@ -109,5 +109,11 @@
    private Integer credential;

    @ApiModelProperty(value = "分类名称")
    private String skillName;
    private String skillTypeName;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "社区名字")
    private String communityName;
}