Merge remote-tracking branch 'origin/master'

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/config/AsyncConfig.java

@@ -47,7 +47,7 @@ public class AsyncConfig implements AsyncConfigurer {
          * <!-- 当线程数>=corePoolSize，且任务队列已满时。线程池会创建新线程来处理任务 -->
          * <!-- 当线程数=maxPoolSize，且任务队列已满时，线程池会拒绝处理任务而抛出异常，异常见下
          */
-        taskExecutor.setMaxPoolSize(50);
+        taskExecutor.setMaxPoolSize(25);
         /**
          * <!-- 缓存队列（阻塞队列）当核心线程数达到最大时，新任务会放在队列中排队等待执行 -->
          */

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java

@@ -723,7 +723,7 @@ public class ExcelUtil <T> implements Serializable {
 				} else {
 					return errorInfo(attr, "_必须为数字且最多两位小数", i);
 				}
-			} else if (attr.min() == 0) {
+			}/* else if (attr.min() == 0) {
 				if (Common.isNumber(c)) {
 					if (attr.isFloat()){
 						if (Float.valueOf(c).compareTo(attr.min()) < CommonConstants.ZERO_INT) {
@@ -731,7 +731,7 @@ public class ExcelUtil <T> implements Serializable {
 						}
 					}
 				}
-			}
+			}*/
 		}
 		return null;
 	}