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

Application/Admin/Controller/MarketPercentageController.class.php

@@ -469,9 +469,11 @@ class MarketPercentageController extends ThinkController
             $sum['achievement_bonus'] += $data[$key]['achievement_bonus'];
             $sum['commission'] += $data[$key]['commission'];
             $sum['extend_commission'] += $data[$key]['extend_commission'];
+            $sum['company_profit'] += $data[$key]['company_profit'];
 
         }
         $sum['wait_commission'] = '-------';
+        $sum['pay_time'] = '总计';
 
         if ($_REQUEST['export']) {
 

Application/Admin/View/Promote/add.html

@@ -8,7 +8,7 @@
 
 
     <div class="cf main-place top_nav_list navtab_list">
-        <h3 class="page_title">新增推广员</h3>
+        <h3 class="page_title">新增会长</h3>
         <p class="description_text">说明：此功是创建推广员时所需填写信息</p>
     </div>