Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Version.php

@@ -443,7 +443,7 @@ class Version extends BaseController
             return error_show(1004,"未找到发货单地址信息");
         }
         $orderinfo =Db::name("sale")->where(["orderCode"=>$outinfo["orderCode"],"is_del"=>0])
-        ->field("good_code,good_name,addtime")->find();
+        ->field("good_code,good_name,addtime,order_type")->find();
         if($orderinfo==false){
             return error_show(1004,"未找到订单信息");
         }