From 47de8ceefb38ee55fc577f94bfda09dd5adbd29d Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期二, 22 十二月 2020 17:18:39 +0800 Subject: [PATCH] 测试更新 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 67 +++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 20 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java index 1fb694e..cbd32da 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java @@ -1,10 +1,13 @@ package com.panzhihua.common.model.vos; +import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; +import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; import java.util.Set; /** @@ -29,70 +32,53 @@ @ApiModelProperty("登录账户") private String account; - @ApiModelProperty("登录密码") private String password; - @ApiModelProperty("微信小程序唯一标识") private String openid; - @ApiModelProperty("手机号") private String phone; - @ApiModelProperty("昵称") private String nickName; - @ApiModelProperty("真实名字") private String name; - @ApiModelProperty("社区id") private Long communityId; + @ApiModelProperty("社区名字") + private String communityName; @ApiModelProperty("性别 1 男 2 女") private Integer sex; - - @ApiModelProperty("身份证号") - private String idcard; - - @ApiModelProperty("生日") private Date birthday; - @ApiModelProperty("头像") private String imageUrl; - @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台") private Integer type; - @ApiModelProperty("职业") private String job; - @ApiModelProperty("是否志愿者 0否 1 是") private Integer isVolunteer; - @ApiModelProperty("是否党员 0 否 1 是") private Integer isPartymember; - @ApiModelProperty("1 启用 2 禁用") private Integer status; - @ApiModelProperty("创建时间") - private Date createTime; - + private Date createAt; @ApiModelProperty("最后登录时间") private Date lastLoginTime; @@ -102,4 +88,45 @@ @ApiModelProperty("权限集合") private Set<String> permissions; + + @ApiModelProperty("人脸采集照片url") + private String faceUrl; + + @ApiModelProperty("驳回原因") + private String rejectReson; + + @ApiModelProperty("身份证号") + private String idCard; + + @ApiModelProperty("标签 多个用,隔开") + private String tags; + + @ApiModelProperty("家庭id") + private Long familyId; + + @ApiModelProperty(value = "分页每页数量",example = "10") + private Long pageSize; + + @ApiModelProperty(value = "分页当前记录数",example = "1") + private Long pageNum; + + @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回") + private Integer faceState; + + @ApiModelProperty("操作类型 1通过 2驳回 3删除") + private Integer operationType; + + @ApiModelProperty("家庭成员") + private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS; + + @ApiModelProperty("房屋信息") + private List<ComMngStructHouseVO> comMngStructHouseVOS; + + @ApiModelProperty("用户小区id") + private Long areaId; + + + + + } -- Gitblit v1.7.1