From fe1853065a2528bcd3a2c36e27ac7c5f4a99ef75 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 27 Jul 2020 09:50:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8E=9F=E5=8C=85=E5=90=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 2ca7cbe75..8b2daedff 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -409,7 +409,7 @@ class CompanyStatementSetController extends Controller {
 			if(empty($v['original_package_name'])){
 				$game_name = $v['game_name'];
 			}else{
-                if($v['select_package_name'] == 1){
+                if($v['select_package_name'] == 0){
                     $game_name = $v['original_package_name'];
                 }else{
                     $game_name = $v['game_name'];

From e2bd47ac2d3b941efb4bd805abc560f442eb945e Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 27 Jul 2020 09:57:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A4=AA=E6=8C=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/CompanyStatement/lists.html     | 2 +-
 Application/Admin/View/CompanyStatementPool/lists.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html
index 942b0064e..bb7f3b44e 100644
--- a/Application/Admin/View/CompanyStatement/lists.html
+++ b/Application/Admin/View/CompanyStatement/lists.html
@@ -88,7 +88,7 @@
 
     <div class="cf top_nav_list" style="height: 38px;">
         <!-- 高级搜索 -->
-        <div class="jssearch fl cf search_list" style="margin-bottom: 0">
+        <div class="jssearch fl cf search_list" style="margin-bottom: 15px;">
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="company_type" name="company_type" class="select_gallery" >
                     <option value="">请选择公司类型</option>
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html
index 3a163fcb4..4fabfb518 100644
--- a/Application/Admin/View/CompanyStatementPool/lists.html
+++ b/Application/Admin/View/CompanyStatementPool/lists.html
@@ -66,7 +66,7 @@
 
     <div class="cf top_nav_list" style="height: 38px;">
         <!-- 高级搜索 -->
-        <div class="jssearch fl cf search_list" style="margin-bottom: 0">
+        <div class="jssearch fl cf search_list" style="margin-bottom: 15px;">
             <div class="input-list">
                 <input type="text"  name="statement_num" class="" placeholder="请输入订单号" value="{:I('statement_num')}" />&nbsp;
             </div>

From 0f023bed367ce0212957c5b6efc92c123c9da397 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 27 Jul 2020 11:13:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/CompanyStatement/lists.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html
index bb7f3b44e..0875ca76d 100644
--- a/Application/Admin/View/CompanyStatement/lists.html
+++ b/Application/Admin/View/CompanyStatement/lists.html
@@ -80,6 +80,10 @@
                     <span class="">新增结算:</span>
                     <span class="">对新增绑定的公司进行结算，仅统计当月数据(不含下游个人)</span>
                 </li>
+                <li class="question_list">
+                    <span class="">上游cp结算:</span>
+                    <span class="">上游CP的结算流水包含聚合的流水</span>
+                </li>
             </ul>
         </div>
     </div>