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

@@ -1127,9 +1127,10 @@ public class AdminOrderController {
         StringBuffer sb = new StringBuffer();
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
                 //orderService.updateSalesOrderPostType(salesOrders,postType);
+                String salesDealCode = salesOrders.getSalesDealCode();
                 bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
-               String salesDealCode = salesOrders.getSalesDealCode();
+               //String salesDealCode = salesOrders.getSalesDealCode();
                if(bl == false){
                    for(EfastOrder efastOrderStyle:orderEfasts){
                        if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
@@ -1141,7 +1142,8 @@ public class AdminOrderController {
                        if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
                            efastOrderStyle.setStyleColor("color:black;");
                    }
-                   sb.append(salesOrders.getSalesDealCode()+"\r\n");
+                   //sb.append(salesOrders.getSalesDealCode()+"\r\n");
+                   sb.append(salesDealCode+"\r\n");
                }
          }
         /*if(!bl){