Merge branch 'v6.4_transportation_20231110' into test

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

@@ -1104,7 +1104,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             orderChild.setCancelDetail(param.getRemark());
         }
         else {
-            orderChild.setCancelRemark(param.getRemark());
+            orderChild.setCancelDetail(param.getRemark());
         }
 
         // 图片
@@ -1143,7 +1143,6 @@ public class OrderChildServiceImpl implements OrderChildService {
                     orderChild.getTruckNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         }
 
-        orderChild.setCancelRemark(param.getRemark());
         orderChild.setCancelTime(LocalDateTime.now());
         orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.DRIVER_CANCEL.getCode());