Merge remote-tracking branch 'origin/developer' into developer

gic-store-api/src/main/java/com/gic/store/utils/field/FieldBase.java

 package com.gic.store.utils.field;
 
 
+import org.apache.commons.collections.CollectionUtils;
+
 import java.util.List;
 
 /**
@@ -58,7 +60,7 @@ public class FieldBase {
         if (msg != null) {
             return msg;
         }
-        if (value != null && !"".equals(value)) {
+        if (value != null && !"".equals(value.trim()) && CollectionUtils.isNotEmpty(nameList)) {
             String[] values = value.split(",");
             for (String val : values) {
                 boolean exist = false;

gic-store-web/src/main/java/com/gic/store/web/utils/ExcelUtils.java

@@ -132,6 +132,9 @@ public class ExcelUtils {
                     }
                 }
                 cell.setCellStyle(style); // 设置单元格样式
+                if (j != 0) {
+                    cell.setCellType(XSSFCell.CELL_TYPE_STRING);
+                }
             }
         }