合并分支 'wangxiaogang' 到 'master'

debug



查看合并请求 !75

@@ -61,7 +61,7 @@ class OrderController extends WeChatBaseController
         $indentGoodsModel = new IndentGoodsModel();
         $indentGoods = $indentGoodsModel->selectData($where2);
         $addressModle = new AddressModel();
-        $address = $addressModle->findData(['id'=>$data['indent_address']])->toArray();
+        $address = $addressModle->findData(['id'=>$data['indent_address']]);
         $data['address'] = $address;
         $data['indent_goods'] = $indentGoods;
         $this->assign('data',$data);