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

充值订单bug修改

Application/Admin/Controller/SpendController.class.php

@@ -72,7 +72,7 @@ class SpendController extends ThinkController
             unset($_REQUEST['pay_game_status']);
         }
 
-        if (isset($_REQUEST['merchant_id'])) {
+        if ($_REQUEST['merchant_id']) {
             $map['merchant_id'] = $_REQUEST['merchant_id'];
             unset($_REQUEST['merchant_id']);
         }