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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

watero-rst-web/src/main/java/com/iamberry/rst/controllers/product/AdminProductController.java

@@ -355,6 +355,7 @@ public class AdminProductController {
         }
         product.setProductAreaRelaList(productAreaRelaList);
 
+
         Integer flag = 0;
         try{
             flag = productService.update(product);