From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java
index bfae1ea..a885ddc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java
@@ -1,14 +1,14 @@
package com.panzhihua.common.model.dtos.community;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
/**
- * Description 重点人员信息
- * ClassName KeyPersonInfo
+ * Description 重点人员信息 ClassName KeyPersonInfo
*
* @author manailin
*/
@@ -26,7 +26,7 @@
/**
* 姓名
*/
- @ExcelProperty(value = "姓名(必填项)" ,index = 0)
+ @ExcelProperty(value = "姓名(必填项)", index = 0)
private String name;
/**
* 性别(取字典表国家编码)
@@ -35,67 +35,67 @@
/**
* 性别名称
*/
- @ExcelProperty(value = "性别名称" ,index = 1)
+ @ExcelProperty(value = "性别名称", index = 1)
private String sexName;
/**
* 身份证号码
*/
- @ExcelProperty(value = "身份证号码" ,index = 2)
+ @ExcelProperty(value = "身份证号码", index = 2)
private String cardNo;
/**
* 联系方式
*/
- @ExcelProperty(value = "联系方式" ,index = 3)
+ @ExcelProperty(value = "联系方式", index = 3)
private String phone;
/**
* 民族
*/
- @ExcelProperty(value = "民族" ,index = 4)
+ @ExcelProperty(value = "民族", index = 4)
private String nation;
/**
* 户口所在地
*/
- @ExcelProperty(value = "户口所在地" ,index = 5)
+ @ExcelProperty(value = "户口所在地", index = 5)
private String censusRegister;
/**
* 居住地址
*/
- @ExcelProperty(value = "居住地址" ,index = 6)
+ @ExcelProperty(value = "居住地址", index = 6)
private String address;
/**
* 地址精度纬度信息（逗号隔开）
*/
- @ExcelProperty(value = "地址精度纬度信息（逗号隔开）" ,index = 7)
+ @ExcelProperty(value = "地址精度纬度信息（逗号隔开）", index = 7)
private String visiterAddressLatLng;
/**
* 人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员
*/
- @ExcelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员" ,index = 8)
+ @ExcelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", index = 8)
private String visiterType;
/**
* (法轮功类填写)基本情况
*/
- @ExcelProperty(value = "(法轮功类填写)基本情况" ,index = 9)
+ @ExcelProperty(value = "(法轮功类填写)基本情况", index = 9)
private String basicInfo;
/**
* 是否有效
*/
- @ExcelProperty(value = "是否有效" ,index = 10)
+ @ExcelProperty(value = "是否有效", index = 10)
private Boolean invalid;
/**
* 备注
*/
- @ExcelProperty(value = "备注" ,index = 11)
+ @ExcelProperty(value = "备注", index = 11)
private String note;
/**
* 文化程度(取字典表国家编码))
*/
- @ExcelProperty(value = "文化程度" ,index = 12)
+ @ExcelProperty(value = "文化程度", index = 12)
private String cultureLevel;
/**
* 经济状态
*/
- @ExcelProperty(value = "经济状态" ,index = 13)
+ @ExcelProperty(value = "经济状态", index = 13)
private String economicLevel;
/**
* 修改人
@@ -112,7 +112,7 @@
/**
* （精神类人群填写）目前诊断
*/
- @ExcelProperty(value = "目前诊断" ,index = 14)
+ @ExcelProperty(value = "目前诊断", index = 14)
private String diagnose;
/**
* 上报提交时间
@@ -121,17 +121,17 @@
/**
* （精神类人群填写）监护人名称
*/
- @ExcelProperty(value = "监护人名称" ,index = 15)
+ @ExcelProperty(value = "监护人名称", index = 15)
private String guardian;
/**
* （精神类人群填写）监护人电话
*/
- @ExcelProperty(value = "监护人电话" ,index = 16)
+ @ExcelProperty(value = "监护人电话", index = 16)
private String guardianPhone;
/**
* （精神类人群填写）监护人关系
*/
- @ExcelProperty(value = "监护人关系" ,index = 17)
+ @ExcelProperty(value = "监护人关系", index = 17)
private String guardianRelation;
/**
* 创建时间
--
Gitblit v1.7.1