From 5f113b8bfcc8ce2e1e0ae686a3cec26d7f6088c7 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 7 Jul 2020 10:51:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 7b893a015..774ebf14f 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/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'];

From b64e5858eae823cae8f1b63a49d4493f3625f537 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 7 Jul 2020 10:57:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/MarketPercentage/marketstaffsettle.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
index 49ade1c20..669c8590c 100644
--- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html
+++ b/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>