Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/mobile/logic/GoodLogic.php

@@ -2,16 +2,11 @@
 
 namespace app\mobile\logic;
 
-use app\model\AddrModel;
 use app\model\CommonModel;
 use app\model\CompanyGoodModel;
 use app\model\GoodModel;
-use app\model\GroupModel;
 use app\model\InventoryExchangeModel;
 use app\model\InventoryShoppingModel;
-use app\model\OrderModel;
-use think\Exception;
-use think\facade\Db;
 use think\response\Json;
 
 class GoodLogic extends BaseLogic

app/mobile/logic/OrderLogic.php

@@ -47,7 +47,8 @@ class OrderLogic extends BaseLogic
                 'updaterid' => self::$aid,
                 'updater' => self::$aname,
                 'updatetime' => $date,
-                'remark' => $data['remark']
+                'remark' => $data['remark'],
+                'addr_id' => $data['addr_id'],
             ];
 
             //子订单数据