Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

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

@@ -1736,6 +1736,10 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         //查询进行中的运单车辆是否开启了中交兴路
         result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));
+
+        result.setLoadTime(orderChild.getLoadTime()==null?convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()):convertLocalDateTimeToDefaultString(orderChild.getLoadTime()));
+        result.setUnloadTime(orderChild.getUnloadTime()==null?convertLocalDateTimeToDefaultString(orderChild.getFirstUnloadTime()):convertLocalDateTimeToDefaultString(orderChild.getUnloadTime()));
+
         return result;
     }