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/controllers/order/AdminOrderController.java

@@ -664,7 +664,7 @@ public class AdminOrderController {
             }*/
             //List<SalesOrder> temporarySalesOrderList = new ArrayList<SalesOrder>();
             //添加子订单
-            if(salesOrderList != null && salesOrderList.size() > 0) {
+            /*if(salesOrderList != null && salesOrderList.size() > 0) {
                 for (SalesOrder salesOrder : salesOrderList) {
                     int salesId = salesOrder.getSalesId();
                     List<SalesOrder> salesMainOrderList = orderService.querySalesOrderItemListBySalesId(salesId);//查询子订单
@@ -674,7 +674,7 @@ public class AdminOrderController {
                         }
                     }
                 }
-            }
+            }*/
             //添加主订单
             if(salesOrderList != null && salesOrderList.size() > 0) {
                 for (SalesOrder salesOrder : salesOrderList) {