Merge branch 'hotfix/payment_merch_bug' of wmtx/platform into release

修改商户规则配置bug

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -509,6 +509,11 @@ class PaymentMerchantController extends ThinkController
                 'message' => $message
             ]);
         }
+        
+        foreach ($records as $key => $record) {
+            $records[$key]['company_belong'] = $record['company_id'] > 0 ? -1 : $record['company_belong'];
+            $records[$key]['game_type_id'] = $record['game_id'] > 0 ? 0 :$record['game_type_id'];
+        }
 
         $ids = [];
         $paymentRuleService = new PaymentRuleService();