Merge branch 'develop' into develop-card-compliance

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.6</version>
+    <version>2.2.7</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/ui/static/payment/partner/partner-manage.js

@@ -1958,6 +1958,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.saveSubMerchantId = function () {
             $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: $scope.paymentInfo.sub_merchant_id}).then(function (resp) {
                 $scope.refreshWechatInstitutionMerchantId();
+                $scope.ctrl.editSubMerchant = false;
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             });
@@ -1965,8 +1966,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
         $scope.refreshWechatInstitutionMerchantId = function () {
             $http.put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', {wechat_institution_merchant_id: $scope.paymentInfo.wechat_institution_merchant_id}).then(function (resp) {
+                debugger
                 $scope.loadPartnerPaymentInfo();
             }, function (resp) {
+                debugger
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             });
         };