From 43c69b2a7ee65a2664b5749cd33cdd3afe50d791 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 26 四月 2021 20:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index ed3ef97..68e235c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -209,7 +209,7 @@
if (result) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
- importErrorVO.setErrorPosition("第" + index + "行,第2列");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
@@ -224,7 +224,7 @@
if (comMngVillageDO == null) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
- importErrorVO.setErrorPosition("第" + index + "行,第7,8列");
+ importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
--
Gitblit v1.7.1