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

条数修改

Application/Admin/Controller/MarketPercentageController.class.php

@@ -169,7 +169,7 @@ class MarketPercentageController extends ThinkController
 
         $count = M("settleup_marketorder","tab_")
             ->where($map)
-            ->group("promote_id,game_name,pay_time")
+            ->group("promote_id,game_name,pay_time,admin_id")
             ->select(false);
 
         $count = M()->table("({$count}) count")->count();