Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java

@@ -47,11 +47,9 @@
    private Integer age;

    @ApiModelProperty("健康状况")
    @NotBlank(groups = {AddGroup.class},message ="健康状况不能为空" )
    private String health;

    @ApiModelProperty("工作")
    @NotBlank(groups = {AddGroup.class},message ="工作不能为空" )
    private String job;

    @ApiModelProperty(value = "create_at",hidden = true)