Merge branch 'feature/admin_optimize' into release

Application/Admin/Controller/PartnerController.class.php

@@ -62,7 +62,7 @@ class PartnerController extends ThinkController
         //获取分页数据
         $query = $model->alias('p')
             ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
-            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark")
+            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
             ->where($map)
             ->order("id desc");
         if($is_export){
@@ -154,7 +154,6 @@ class PartnerController extends ThinkController
             $parseData[$value['partner_id']][] = $value;
         }
         $parseData = array_values($parseData);
-
         if($is_export){
             $this->assign('listData', $parseData[0]);
             $this->display("export");