合并分支 '1iuzhen' 到 'master'

支付方式筛选导出添加



查看合并请求 !227

@@ -147,6 +147,7 @@ class OrderController extends AdminBaseController
         $this->assign('keyword',isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('sort_id',isset($param['sort_id']) ? $param['sort_id'] : '');
         $this->assign('status',isset($param['status']) ? $param['status'] : '');
+        $this->assign('pay_type',isset($param['pay_type']) ? $param['pay_type'] : '');
         $this->assign('is_excel',isset($param['is_excel']) ? $param['is_excel'] : '');
         $this->assign('is_over',isset($param['is_over']) ? $param['is_over'] : '');
         $this->assign('start_time',isset($param['start_time']) ? $param['start_time'] : '');