From f54ecc8eb107f12108903fc9cc672cddd71989db Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 17:39:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
index d12ea57..a06849e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
@@ -1,11 +1,95 @@
-package com.panzhihua.common.model.vos.user;/**
-* @program: springcloud_k8s_panzhihuazhihuishequ
-*
-* @description: 社区人员详情
-*
-* @author: huang.hongfa weixin hhf9596 qq 959656820
-*
-* @create: 2021-02-18 09:43
-**/
+package com.panzhihua.common.model.vos.user;
+
+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
+ * @description: 社区人员详情
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-18 09:43
+ **/
+@Data
+@ApiModel("社区人员详情")
public class CommunityUserInfoVO {
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("0 未婚 1 已婚")
+ private Integer maritalStatus;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("工作单位（学校）")
+ private String company;
+
+ @ApiModelProperty("user_id")
+ private Long userId;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("户口所在地")
+ private String residence;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("文化程度")
+ private String education;
+
+ @ApiModelProperty("专享政策")
+ private String tags;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否志愿者 0否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("志愿者申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date volunteerCreateAt;
+
+ @ApiModelProperty("家庭成员")
+ private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("房屋信息")
+ private List<ComMngStructHouseVO> comMngStructHouseVOS;
+
+ @ApiModelProperty("目前是否在攀枝花 0 否 1 是")
+ private Integer isPanzhiHua;
+
+ @ApiModelProperty("是否有与疑似或确诊病例密切接触史 0 否 1 是")
+ private Integer isContact;
+
+ @ApiModelProperty("近一个月离（返）攀情况")
+ private String situation;
+
+
+
+
+
}
--
Gitblit v1.7.1