From c5f9d214b2d63506cfbab5cc977610da3b133ec4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 21 十一月 2022 10:11:33 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
index b2effc1..609e1cb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
+
import lombok.Data;
/**
@@ -18,6 +19,10 @@
*/
@ExcelProperty("序号")
private String order;
+
+ @ExcelProperty("小区")
+ private String areaName;
+
/**
* 门牌号
*/
@@ -27,7 +32,7 @@
* 是否租住
*/
@ExcelProperty("是否租住")
- private String isRent;
+ private String isRent = "否";
/**
* 姓名
*/
@@ -47,7 +52,7 @@
* 婚姻状态
*/
@ExcelProperty("婚姻状态")
- private String maritalStatus;
+ private String maritalStatus = "否";
/**
* 联系方式
*/
@@ -77,57 +82,61 @@
* 目前是否在攀枝花
*/
@ExcelProperty("目前是否在攀枝花")
- private String isPanZhiHua;
+ private String isPanZhiHua = "否";
/**
* 近一个月离（返）攀情况
*/
@ExcelProperty("近一个月离（返）攀情况")
- private String situation;
+ private String situation = "否";
/**
* 是否有与疑似或确诊病例密切接触史
*/
@ExcelProperty("是否有与疑似或确诊病例密切接触史")
- private String isContact;
+ private String isContact = "否";
/**
* 特殊情况（重大过往病史或者孕妇）
*/
@ExcelProperty("特殊情况（重大过往病史或者孕妇")
- private String major;
+ private String major = "否";
/**
* 退役军人
*/
@ExcelProperty("退役军人")
- private String soldier;
+ private String soldier = "否";
/**
* 残疾人
*/
@ExcelProperty("残疾人")
- private String disability;
+ private String disability = "否";
/**
* 低保户
*/
@ExcelProperty("低保户")
- private String lowIncomeHouseholds;
+ private String lowIncomeHouseholds = "否";
/**
* 低收入人员
*/
@ExcelProperty("低收入人员")
- private String lowIncomePeople;
+ private String lowIncomePeople = "否";
/**
* 高龄老人
*/
@ExcelProperty("高龄老人")
- private String oldPeople;
+ private String oldPeople = "否";
/**
- *特服家庭
+ * 特服家庭
*/
@ExcelProperty("特服家庭")
- private String specialServiceFamily;
+ private String specialServiceFamily = "否";
/**
- *重点人员
+ * 重点人员
*/
@ExcelProperty("重点人员")
- private String keyPersonnel;
+ private String keyPersonnel = "否";
+
+ @ExcelProperty("标签")
+ private String tags;
+
/**
* 房屋编码
*/
--
Gitblit v1.7.1