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

@@ -1043,6 +1043,7 @@ public class AdminOrderController {
                 salesOrderList.add(salesOrder);
                 mapsalesOrderList.put(orderId, salesOrder);
             } else {
+                salesOrder.setSalesDealCode(orderId);
                 // 有订单，合并到原有订单的订单项
                 salesOrderItem = new SalesOrderItem();
                 salesOrderItem.setItemColorId(productColor.getColorId());