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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -692,14 +692,13 @@
 <script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.parse.js"></script>
 <script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
 
-
 <#-- 业务脚本JS -->
 <script type="text/javascript" charset="utf-8" src="${path}/common/js/customer/customer.js"></script>
 
-
-
 <script type="text/javascript">
 
+    var customerId = "${customerInfo.customerId!''}";
+
     /*是否是修改页面*/
     var isUpdate = true;
 
@@ -840,19 +839,6 @@
 
     })
 
-    /*用于初始化回访信息的展示--重写*/
-    function initVisitEvent(){
-        $("input[name='customerIsVisit']").change(function (){
-            if(!isUpdate){
-                if($(this).val() == 2){
-                    $("#needToVisit").css("display","block");
-                }else{
-                    $("#needToVisit").css("display","none");
-                }
-            }
-        })
-    }
-
     /**
      * 初始化问题描述
      */
@@ -935,10 +921,10 @@
 
             /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
             if(isInitAddress == 1 || isInitAddress == 2){
-                var proId = setPro(null,2);
-                var cityId = setCity(null,proId,2);
-                setDistrict(null,cityId,2);
-                isInitAddress = 1;
+//                var proId = setPro(null,2);
+//                var cityId = setCity(null,proId,2);
+//                setDistrict(null,cityId,2);
+//                isInitAddress = 1;
             }else if(isInitAddress == 3 || isInitAddress == 4 ||  isInitAddress == 5 ||  isInitAddress == 6 ||  isInitAddress == 7){
                     setPro(null,2);  //创建省
                     setCity(null,proId,2);