From 49e8327ac8596665635aea42773dc2e6a6f0f335 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 20 Jan 2024 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/services/ExcelService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 9afd75f2..28e1264c 100644 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -372,8 +372,8 @@ class ExcelService 'commission_to_cloud_warehouse_refund' => '退回平台佣金', 'first_order_commission' => '首单拉新', ]; - $sys_pm_1 = ['first_order_commission','supply_chain','order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform']; - $mer_pm_1 = ['order_true','order', 'presell', 'refund_brokerage_one', 'refund_brokerage_two', 'mer_presell', + $sys_pm_1 = ['auto_margin','order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform']; + $mer_pm_1 = ['first_order_commission','order_true','order', 'presell', 'refund_brokerage_one', 'refund_brokerage_two', 'mer_presell', 'order_platform_coupon', 'commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_town', 'commission_to_village', 'commission_to_service_team']; $date_ = $where['date']; unset($where['date']);