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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

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

@@ -417,16 +417,16 @@
                         itemList.push(salesOrderItem);
                     }
                 })
-//                $("#addProduct").find(".input-color-number").each(function(){
-//                    var number = $(this).val();
-//                    if(number != null && number != ""){
-//                        var salesOrderItem = new Object();
-//                        salesOrderItem.itemProductId = $(this).parent().find(".input-produce-id").val();
-//                        salesOrderItem.itemColorId = $(this).parent().find(".input-color-id").val();
-//                        salesOrderItem.itemNum = number;
-//                        itemList.push(salesOrderItem);
-//                    }
-//                })
+                $("#addProduct").find(".input-fittings-number").each(function(){
+                    var number = $(this).val();
+                    if(number != null && number != ""){
+                        var salesOrderItem = new Object();
+                        salesOrderItem.itemProductId = $(this).parent().find(".input-produce-id").val();
+                        salesOrderItem.itemColorId = $(this).parent().find(".input-color-id").val();
+                        salesOrderItem.itemNum = number;
+                        itemList.push(salesOrderItem);
+                    }
+                })
                 $("#itemJson").val(JSON.stringify(itemList));
             },
             callback: function (data) {//异步回调函数