From 26888f46e583df1dfabd94bd5eeee2365e991c55 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 29 六月 2021 15:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 31c2d97..0ec4042 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -333,7 +333,7 @@
vo.setHouseHold(oneData.get(27).trim());
}
if(StringUtils.isEmpty(oneData.get(28))){
- vo.setHouseHold(oneData.get(28).trim());
+ vo.setIsResidence(0);
}else{
vo.setIsResidence(PopulIsOkEnum.getCodeByName(oneData.get(28).trim()));
}
--
Gitblit v1.7.1