Merge branch 'hotfix/dopositCpModify' into release

Application/Admin/Controller/ExportController.class.php

@@ -1176,6 +1176,7 @@ class ExportController extends Controller
 
                     foreach($xlsData as $value) {
                         $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
+                        $value['extend'] = $value['extend'].'`';
                         $value['pay_way'] = get_pay_way($value['pay_way']);
                         $value['pay_status'] = get_info_status($value['pay_status'],9);
                         $value['pay_game_status'] = get_info_status($value['pay_game_status'],14);

Application/Home/Controller/DownloadController.class.php

@@ -1304,7 +1304,7 @@ class DownloadController extends BaseController {
         empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%'];
         empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number');
         // $map['tab_spend.pay_status'] = 1;
-        $map['tab_spend.is_check'] = ['neq', 2];
+        // $map['tab_spend.is_check'] = ['neq', 2];
         if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') {
             $payStatus = intval(I('pay_status'));
 

Application/Home/Controller/QueryController.class.php

@@ -100,7 +100,6 @@ class QueryController extends BaseController
             }
         }
         $map['tab_spend.pay_time'] = ['between', [$begTime, $endTime - 1]];
-        $map['tab_spend.is_check'] = ['neq', 2];
 
         $data = [];
         $count = 0;