From a848afa0e31ae0d2bef4e546f932c06f1cd93a62 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 16 十二月 2021 15:23:42 +0800
Subject: [PATCH] 12/16 大屏基础页面修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
index 81ccc1c..a9ce1c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
@@ -1,15 +1,16 @@
package com.panzhihua.common.model.vos.grid;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
*
@@ -17,51 +18,63 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("居民列表返回参数")
@EncryptDecryptClass
public class PopulationListVO {
@ApiModelProperty(value = "主键ID")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ApiModelProperty(value = "姓名")
- private String name;
+ private String name;
@ApiModelProperty(value = "手机号")
- @EncryptDecryptField
- private String phone;
+ @EncryptDecryptField
+ private String phone;
- @ApiModelProperty(value = "身份证号码")
- @EncryptDecryptField
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
private String cardNo;
@ApiModelProperty(value = "标签")
- private String label;
+ private String label;
- @ApiModelProperty(value = "居住地址")
- private String address;
+ @ApiModelProperty(value = "居住地址")
+ private String address;
@ApiModelProperty(value = "民族")
- private String nation;
+ private String nation;
- @ApiModelProperty(value = "年龄")
- private Integer age;
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
- @ApiModelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- private Integer politicalOutlook;
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
@ApiModelProperty(value = "性别（1.男 2.女）")
- private String sex;
+ private String sex;
- @ApiModelProperty(value = "时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty(value = "房屋人口关联id")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long housePopulationId;
+ @ApiModelProperty(value = "房屋人口关联id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long housePopulationId;
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "政治面貌文字描述")
+ private String outlook;
+
+ @ApiModelProperty(value = "人和房屋关系（1.业主 2.业主家属 3.租户）")
+ private Integer relationId;
}
--
Gitblit v1.7.1