Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,13 +1,14 @@
package com.panzhihua.common.model.vos.user;

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -105,7 +106,5 @@
     */
    @ApiModelProperty("户口本照片(多张以,号隔开)")
    private String familyBook;



}