From 811587a33f42dd0f56e59460bbd628c4517cccfb Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 25 May 2021 18:02:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=92=8C=E9=87=8D=E7=AE=97=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/View/GameMargin/lists.html b/Application/Admin/View/GameMargin/lists.html
index 821393d4f..59be741ff 100644
--- a/Application/Admin/View/GameMargin/lists.html
+++ b/Application/Admin/View/GameMargin/lists.html
@@ -83,8 +83,8 @@
         <div class="butnlist jscheckbutn" style="margin-left: 2px">
             <if condition = "$isCanRecount">
                 <a class="butn" id="addMargin">生成毛利表</a>
-                <a class='butn' id='export'>导出</a>
             </if>
+            <a class='butn' id='export'>导出</a>
         </div>
     </div>
 

From 7f9d2e3c9792be6bda6c88f10b795a946748064f Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 25 May 2021 18:07:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B1=BB=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/GameMarginController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/GameMarginController.class.php b/Application/Admin/Controller/GameMarginController.class.php
index 9670fa32c..97d5ba27e 100644
--- a/Application/Admin/Controller/GameMarginController.class.php
+++ b/Application/Admin/Controller/GameMarginController.class.php
@@ -133,7 +133,7 @@ class GameMarginController extends AdminController
         define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
         Vendor("PHPExcel.PHPExcel");
-        $objReader = \PHPExcel_IOFactory::createReader('excel2007');
+        $objReader = \PHPExcel_IOFactory::createReader('Excel2007');
         //设置模板文件
         $objPHPExcel = $objReader->load("Public/Admin/excel/gamemargin.xlsx");
         $marginInfo =  json_decode($info['margin_info'],true);
@@ -263,7 +263,7 @@ class GameMarginController extends AdminController
         header('pragma:public');
         header('Content-type:application/vnd.ms-excel;charset=utf-8;name="'.$fileName.'".xlsx');
         header("Content-Disposition:attachment;filename={$fileName}.xlsx");//attachment新窗口打印inline本窗口打印
-        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'excel2007');
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
         $objWriter->save('php://output');
         exit;
 

From 543fc37ba2c40582547fb4a40534f38dce2d2934 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 26 May 2021 11:05:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Model/TransferMerchantModel.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Model/TransferMerchantModel.class.php b/Application/Admin/Model/TransferMerchantModel.class.php
index 92a3c71bc..32391243b 100644
--- a/Application/Admin/Model/TransferMerchantModel.class.php
+++ b/Application/Admin/Model/TransferMerchantModel.class.php
@@ -14,8 +14,8 @@ class TransferMerchantModel extends Model
         "3"=>"通用一个账号"
     ];
     const IS_FREE_STR = [
-        "1"=>"官方自营接口（提现免手续费）",
-        "2"=>"官方接口"
+        "1"=>"官方直营接口（提现免手续费）",
+        "2"=>"官方支付宝接口"
     ];
     const StatementPaymentWhere ="ways = 1 or ways = 3";
     const UnderPaymentWhere ="ways = 2 or ways = 3";