From 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 20:47:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
index bd5264b..3ed2e1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
@@ -17,55 +17,58 @@
@EncryptDecryptClass
public class ComMngPopulationDrugMistakeExcelVO implements Serializable {
- @ExcelProperty(value = "姓名", index = 0)
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
private String name;
- @ExcelProperty(value = "身份证号码", index = 2)
+ @ExcelProperty(value = "身份证号码", index = 3)
@EncryptDecryptField
private String cardNo;
- @ExcelProperty(value = "民族", index = 1)
+ @ExcelProperty(value = "民族", index = 2)
private String nation;
- @ExcelProperty(value = "联系电话", index = 3)
+ @ExcelProperty(value = "联系电话", index = 4)
private String phone;
- @ExcelProperty(value = "是否租住", index = 9)
+ @ExcelProperty(value = "是否租住", index = 10)
private String isRent;
- @ExcelProperty(value = "街/路/巷", index = 4)
+ @ExcelProperty(value = "街/路/巷", index = 5)
private String road;
- @ExcelProperty(value = "小区号", index = 5)
+ @ExcelProperty(value = "小区号", index = 6)
private String doorNo;
- @ExcelProperty(value = "楼排号", index = 6)
+ @ExcelProperty(value = "楼排号", index = 7)
private String floor;
- @ExcelProperty(value = "单元号", index = 7)
+ @ExcelProperty(value = "单元号", index = 8)
private String unitNo;
- @ExcelProperty(value = "户室（房间号）", index = 8)
+ @ExcelProperty(value = "户室（房间号）", index = 9)
private String houseNo;
- @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
private String houseStatus;
- @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 11)
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 12)
private String housePurpose;
- @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
private String controlStatus;
- @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 13)
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 14)
private String outOrLocal;
- @ExcelProperty(value = "户口所在地", index = 14)
+ @ExcelProperty(value = "户口所在地", index = 15)
private String censusRegister;
- @ExcelProperty(value = "备注", index = 15)
+ @ExcelProperty(value = "备注", index = 16)
private String remark;
- @ExcelProperty(value = "错误信息", index = 16)
+ @ExcelProperty(value = "错误信息", index = 17)
private String mistake;
}
--
Gitblit v1.7.1