Merge branch 'v22.8_sample_img_video_20240822'

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2665,8 +2665,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
         FeignAddressVO.Address sendAddress = data.getSendAddress();
         FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
-        carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getProvince()+sendAddress.getCity()+sendAddress.getCounty()+sendAddress.getAddress());
-        carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getProvince()+receiveAddress.getCity()+receiveAddress.getCounty()+receiveAddress.getAddress());
+        carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getAddress());
+        carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getAddress());
 
         return carrierOrderChildDetailVO;
     }