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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -2055,7 +2055,7 @@ public class AdminSalesOrderController {
 
                 dealerSelfOperated = dealerChannel.getDealerSelfOperated();
 
-                if(2 == dealerChannel.getDealerSelfOperated()){
+             /*   if(2 == dealerChannel.getDealerSelfOperated()){*/
                     //2:非自营
                     for (ProductColor pc:productColorList) {
                         DealerProduct dealerProduct = new DealerProduct();
@@ -2083,7 +2083,7 @@ public class AdminSalesOrderController {
                             rj.setResultMsg("未能从该客户中获取到对应产品的信息，客户名称："+dealerChannel.getDealerName()+"；产品名称："+ pc.getProductName() +"("+ pc.getColorName() +")。");
                         }
                     }
-                }
+                /*}*/
             }else{
                 rj = ResponseJson.getFAILURE();
                 rj.setResultMsg("查询店铺对应客户信息失败，店铺ID为空。");