Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/order/OrderImport.java

@@ -222,11 +222,11 @@ public class OrderImport extends Controller {
                                 iserr = true;
                                 row.put("msg", "数量不为数字格式，请检查");
                                 rowserr.add(row);
-                            } else if(!isNumeric(row.getString("length"))){
+                            } else if(!isNumeric(StringUtils.isBlank(row.getString("length"))?"0":row.getString("length"))){
                                 iserr = true;
                                 row.put("msg", "长度不为数字格式，请检查");
                                 rowserr.add(row);
-                            } else if(!isNumeric(row.getString("width"))){
+                            } else if(!isNumeric(StringUtils.isBlank(row.getString("width"))?"0":row.getString("width"))){
                                 iserr = true;
                                 row.put("msg", "宽度不为数字格式，请检查");
                                 rowserr.add(row);