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

付商户bug修改

Application/Admin/Controller/PayMerchantController.class.php

@@ -38,8 +38,8 @@ class PayMerchantController extends ThinkController
             $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399));
         }
 
-        if ($_REQUEST['game_id']) {
+        if ($_REQUEST['account']) {
-            $map['game_id'] = $_REQUEST['game_id'];
+            $map['merchant.account'] = $_REQUEST['account'];
         }
 
         if ($_REQUEST['name']) {