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

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

@@ -279,7 +279,7 @@
 
 <script type="text/javascript">
 
-    var salesCustomerId = ${salesOrder.salesCustomerId!''};
+    var salesCustomerId = "${salesOrder.salesCustomerId!''}";
 
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',