20210415v1.1

tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@@ -520,6 +520,10 @@ public class ExcelService implements IExcelService {
                 String stakeholderPhoneCell = ExcelUtil.getCellValue(row.getCell(4));
                 ProMember stakeholder = null;
                 ProMember member;
+                //所有值都为空，跳至下一循环
+                if ((StrUtil.isEmpty(memberCell) && StrUtil.isEmpty(phoneCell))) {
+                    continue;
+                }
                 //手机号不能为空
                 if ((StrUtil.isNotEmpty(memberCell) && StrUtil.isEmpty(phoneCell)) ||
                         (StrUtil.isNotEmpty(stakeholderCell) && StrUtil.isEmpty(stakeholderPhoneCell))) {

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common