Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Reorder.php

@@ -115,6 +115,9 @@ class Reorder extends Base
                 if($returnadr!=""){
                     $inf=[];
                     foreach ($returnadr as $val){
+
+                        if ($val['return_num'] == 0) continue;//当退货数量为0时，跳过
+
                         $temp=[];
                         $addrinfo =Db::name("order_addr")->where(['id'=>$val['id'],"orderCode"=>$ordeCode])->find();
                         if($addrinfo==false){