修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -124,7 +125,7 @@
    @ApiModelProperty("小区名字")
    private String alley;

    @ApiModelProperty("户主关系")
    @ApiModelProperty("户主关系列表")
    private List<ComHouseMemberVo> comMngFamilyInfoVOS;

    @ApiModelProperty("家庭成员信息")
@@ -137,11 +138,11 @@
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;

    @ApiModelProperty("文化程度")
    private String cultureLevel;
    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;

    @ApiModelProperty("婚姻状况")
    private String marriage;
    @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
    private Integer marriage;

    @ApiModelProperty("健康状况")
    private String healthy;
@@ -152,6 +153,15 @@
    @ApiModelProperty("户口所在地")
    private String censusRegister;

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

    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;

    @ApiModelProperty("车辆列表")
    private List<ComMngPopulationCarVO> carList;

    public interface sex{
        int nan = 1;
        int nv = 2;