Accept Merge Request #226: (feature/hant -> develop)

Merge Request: 地区问题

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/226?initial=true

application/admin/controller/orders/Dispatch.php

@@ -110,6 +110,7 @@ class Dispatch extends Backend
             $formattedTree = $this->formatTree($tree);
 
             $area_name = model('area')->getNameByCode($order->area_id);
+//            dd($area_name);
             $order->area_name = str_replace(',', '/', $area_name);
             $this->view->assign('items', $formattedTree);
             $this->view->assign('row', $order);

application/admin/model/Area.php

@@ -10,7 +10,7 @@ class Area extends Model
 {
 
     // 表名
-    protected $name = 'area';
+    protected $name = 'areas';
 
 
     public function getNameByCode($code){

application/common/command/ImportArea.php

@@ -69,7 +69,7 @@ class ImportArea extends Command
             }
 
 
-            Db::table('fa_area')->insertAll($out);
+            Db::table('fa_areas')->insertAll($out);
             Db::commit();
             $output->writeln("<info>港澳台区域数据导入成功！</info>");
         } catch (\Throwable $e) {