Merge branch 'lyq' into 'test'

罗元桥

2021-05-25 b24f9c75c79e4de248505295bfea7055e4975ff4

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

@@ -9,22 +9,35 @@
import lombok.Data;

@Data
@ApiModel("房屋成员信息")
@ApiModel("户主关系对象")
@EncryptDecryptClass
public class ComHouseMemberVo {

    @ApiModelProperty("房屋成员用户id")
    private Long id;
    private Long populId;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("手机号")
    @EncryptDecryptField
    @Sensitive(strategy = SensitiveStrategy.PHONE)
//    @Sensitive(strategy = SensitiveStrategy.PHONE)
    private String phone;

    @ApiModelProperty("与户主关系")
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private String relation;

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

    @ApiModelProperty("健康状况")
    private String healthy;

    @ApiModelProperty("身份证号")
    @EncryptDecryptField
    private String cardNo;

    @ApiModelProperty("工作单位")
    private String workCompany;

}