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

市场业绩提成优化

Application/Admin/Controller/MarketPercentageController.class.php

@@ -468,7 +468,7 @@ class MarketPercentageController extends ThinkController
     }
 
     public function personMarketStaffSettle($row = 10, $p = 1) {
-        var_dump(getMarketAdmin());
+//        var_dump(getMarketAdmin());
         $map = [];
 
         $map['group_id'] = ['in','11,12,21'];

Application/Admin/View/MarketPercentage/marketstaffsettle.html

@@ -106,7 +106,7 @@
                         <th>维护总流水</th>
                         <th >业绩提成</th>
                         <th >绩效考核奖金</th>
-                        <th>当月总提成</th>
+                        <th>当月合计</th>
                         <th>应发金额</th>
                         <th>待发金额</th>
                     </tr>