Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -174,13 +174,13 @@ public class ExcelUtil {
             }
             i++;
 
-            if(number > maxNuber+1){
+            /*if(number > maxNuber+1){
                 return false;
             }
 
             if(i > maxNuber+1){
                 break;
-            }
+            }*/
         }
         return true;
     }