Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.55</version>
+    <version>1.2.56</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/ui/static/merchantapplication/merchant_application.js

@@ -481,32 +481,6 @@
             }
         }
 
-        if ($scope.partner.client_pay_type.length == 0) {
-            alert('请选择商户支付场景')
-            return;
-        }
-        if ($scope.partner.client_pay_desc.length == 0) {
-            alert('请选择商户支付方式')
-            return;
-        }
-        if ($scope.partner.client_pay_type.indexOf('1') >= 0) {
-            if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) {
-                alert("请检查线上支付场景是否已选择支付方式");
-                return;
-            }
-        }
-        if ($scope.partner.client_pay_type.indexOf('2') >= 0) {
-            if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) {
-                alert("请检查线下支付场景是否已选择支付方式");
-                return;
-            }
-        }
-        if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-            if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
-                alert("请检查线下支付是否已选择收银系统类型");
-                return;
-            }
-        }
         $scope.initParam();
         if ($scope.partner.company_name.indexOf("Migration") != -1) {
             alert("Company Name包含敏感词汇，请检查后重新提交！");