Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1076,6 +1076,8 @@ class FinanceRepository extends BaseRepository
         //导出数据
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
+            ini_set('memory_limit', '-1');
+            set_time_limit(0);
             $date['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
             ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
             ->order('ub.bill_id', 'desc')