Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 0edab788f512d3c269c6b5caa62682dc1ef396f4

 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;
}