Merge branch 'feature/finance_statement723' of wmtx/platform into release

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'];

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>
@@ -88,7 +92,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>

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>