Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 a6208e99d08435959b234141f0fe0d4f81c47b00

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -158,4 +158,10 @@
    @ApiModelProperty(value="修改时间")
    private Date updateAt;

    /**
     * 是否租住(0.否 1.是)
     */
    @ApiModelProperty(value="是否租住(0.否 1.是)")
    private Integer isRent;

}

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

@@ -153,4 +153,11 @@
     */
    @ApiModelProperty("家庭成员")
    private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;

    /**
     * 是否租住(0.否 1.是)
     */
    @ApiModelProperty("是否租住")
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java

@@ -108,8 +108,13 @@
     */
    private String nation;
    /**
     * 是否租住(0.否 1.是)
     */
    private Integer isRent;
    /**
     * 小区名字
     */
    @TableField(exist = false)
    private String villageName;