From 115ba80cfd41258574d0e215e427cb041e21b40f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 12 五月 2021 10:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index 733b3bf..5d8d803 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -66,7 +66,7 @@
private String workCompany;
@ExcelProperty(value = "外地or本地", index = 17)
- private String outOrLocal;
+ private Integer outOrLocal;
@ExcelProperty(value = "户口所在地", index = 18)
private String censusRegister;
@@ -82,4 +82,12 @@
*/
private List<String> userTagStr = Lists.newArrayList();
+ /**
+ * 外地or本地(1.本地 2.外地)
+ */
+ public interface outOrLocal{
+ String bd = "本地";
+ String wd = "外地";
+ }
+
}
--
Gitblit v1.7.1