Merge branch 'liuzj-permission-dev' into test

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -35,7 +35,7 @@ class JiesuanController extends CatchController
                 return $query->where('jiesuan_date', '<=', $jiesuanDateEndAt . ' 23:59:59');
             })
             ->orderBy('jiesuan_date', 'desc')
-            ->select('id', 'jiesuan_date', 'charge_money', 'tuikuan_money', 'share_rate', 'jiesuan_money');
+            ->select('id', 'jiesuan_date', 'charge_money', 'tuikuan_money', 'share_rate', 'jiesuan_money', 'company_uid');
         if($isExport) {
             $results = $sql->get();
         } else {