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

Merge Request: 订单录入

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

application/admin/controller/Order.php

@@ -234,7 +234,7 @@ class Order extends Backend
         $area = new \app\admin\model\Area();
         $area_name = $area->getNameByCode($order->area_id);
         $order->area_name = $area_name;
-
+//        dd($area_name);
         // 将订单数据传递到视图
         $this->assign('row', $order);
 

application/admin/model/Area.php

@@ -13,7 +13,8 @@ class Area extends Model
 
 
     public function getNameByCode($code){
-        return $this->where('area_code',$code)->find()->value('merge_name');
+        return $this->where('area_code','=',$code)
+            ->value('merge_name');
     }