From 4e8338d3e2b30e360f028c9f2354462ca817a989 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 17:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 1 +
1 files changed, 1 insertions(+), 0 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 8d3abd7..2ecee2f 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
@@ -187,6 +187,7 @@
// }
// String relation = convertMarriage(oneData.get(5));
Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
+
if(isOk.equals(-1)){
// vo.setMarriageStr(ma);
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
--
Gitblit v1.7.1