From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 2 +-
1 files changed, 1 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 9265d13..7b48bd8 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
@@ -110,7 +110,7 @@
@ExcelProperty(value = "居住地址", index = 28)
private String address;
- @ExcelProperty(value = "人员类型（1、户籍人员2、留守人员3、外地人员4、境外人员）", index = 29)
+ @ExcelProperty(value = "人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）", index = 29)
private Integer personType;
@ExcelProperty(value = "国家", index = 30)
--
Gitblit v1.7.1