瀏覽代碼

Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130

donglang 2 周之前
父節點
當前提交
3591d60ec2

+ 5 - 2
sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/LogisticsEntDtoVO.java

@@ -1,10 +1,11 @@
 package com.sckw.contract.api.model.vo;
 
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -12,7 +13,9 @@ import java.util.Date;
 @Getter
 @Setter
 @ToString
-public class LogisticsEntDtoVO {
+public class LogisticsEntDtoVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 合同id

+ 0 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -306,8 +306,6 @@ public class kwfTruckTraceService {
             }
 
         }
-        kwfTruckTraceReplay.setStatus(String.valueOf(waybillOrder.getStatus()));
-        kwfTruckTraceReplay.setStatusDesc(CarWaybillEnum.getName(waybillOrder.getStatus()));
         KwtWaybillOrderSubtask subtask = worderNoAndWorderMap.getOrDefault(waybillOrder.getWOrderNo(), new KwtWaybillOrderSubtask());
         kwfTruckTraceReplay.setRelationTaskNo(String.valueOf(subtask.getLOrderId()));
         KwtLogisticsOrder logisticsOrder = logisticsOrderMap.getOrDefault(subtask.getLOrderId(), new KwtLogisticsOrder());