Merge remote-tracking branch 'origin/master'

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -39,7 +39,7 @@
             sw.victoriatourist_json,
             lis.logistics_company_code,
             lis.`code` AS logisticsCode,
-            pb.detailed_address
+            if(sw.business_type =5,(select jd.address from bytesailing_victoriatourist.jd_order jd where jd.id = sw.business_id and jd.del_flag = 0),pb.detailed_address) as detailedAddress
         FROM
             stock_wait sw
                 LEFT JOIN stock_wait_details swd ON swd.stock_wait_id = sw.id