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

# Conflicts:
#	sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/PageMoreRes.java

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruck.java

@@ -153,6 +153,12 @@ public class KwfTruck extends BaseModel {
      */
     @TableField("vin")
     private String vin;
+    /**
+     * 企业id
+     */
+    @TableField("ent_id")
+    private Long entId;
+
 
     /**
      * 发动机号

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckSaveParam.java

@@ -135,5 +135,7 @@ public class TruckSaveParam implements Serializable {
     @Schema(description = "车队id")
     private Long fleetId;
 
+    @Schema(description = "企业id")
+    private Long entId;
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -396,7 +396,7 @@ public class KwfDriverService {
         truckSaveParam.setVin(request.getVin());
         truckSaveParam.setBrand(request.getBrand());
         truckSaveParam.setPositionDevice(request.getPositionDevice());
-        
+        truckSaveParam.setEntId(StringUtils.isNotBlank(entId) ? Long.valueOf(entId) : LoginUserHolder.getEntId());
         log.info("调用truckService.saveTruck保存车辆档案，truckNo={}", request.getTruckNo());
         try {
             truckService.saveTruck1(truckSaveParam);

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2389,6 +2389,7 @@ public class KwfTruckService {
                     .eq(KwfTruck::getTruckNo, param.getTruckNo()));
             KwfTruck truck = new KwfTruck();
             truck.setTruckNo(param.getTruckNo());
+            truck.setEntId(param.getEntId());
             truck.setType(param.getType());
             truck.setEnergyType(param.getEnergyType());
             truck.setEev(param.getEev());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/PageMoreRes.java

@@ -1,37 +1,39 @@
-package com.sckw.payment.utils;
-
-import com.github.pagehelper.PageInfo;
-import com.sckw.core.model.page.PageRes;
-import com.sckw.payment.pojo.vo.res.SettlementLogisticsSumVo;
-
-/**
- * 返回的分页数据中，有额外需要返回的参数
- *
- * @author Aick Spt
- * @date 2023-07-25 17:31
- */
-public class PageMoreRes<T> extends PageRes<T> {
-
-    /**
-     * 更多其余数据
-     */
-    public SettlementLogisticsSumVo otherList;
-
-
-    public void setOtherList(SettlementLogisticsSumVo otherList) {
-        this.otherList = otherList;
-    }
-
-
-    public SettlementLogisticsSumVo getOtherList() {
-        return otherList;
-    }
-
-    public PageMoreRes(PageInfo<T> pageInfo, SettlementLogisticsSumVo otherList) {
-        super(pageInfo);
-        this.otherList = otherList;
-    }
-
-
-
-}
+//package com.sckw.payment.utils;
+//
+//import com.github.pagehelper.PageInfo;
+//import com.sckw.core.model.page.PageRes;
+//import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
+//
+//import java.util.List;
+//
+///**
+// * 返回的分页数据中，有额外需要返回的参数
+// *
+// * @author Aick Spt
+// * @date 2023-07-25 17:31
+// */
+//public class PageMoreRes<T> extends PageRes<T> {
+//
+//    /**
+//     * 更多其余数据
+//     */
+//    public SettlementLogisticsSumVo otherList;
+//
+//
+//    public void setOtherList(SettlementLogisticsSumVo otherList) {
+//        this.otherList = otherList;
+//    }
+//
+//
+//    public SettlementLogisticsSumVo getOtherList() {
+//        return otherList;
+//    }
+//
+//    public PageMoreRes(PageInfo<T> pageInfo, SettlementLogisticsSumVo otherList) {
+//        super(pageInfo);
+//        this.otherList = otherList;
+//    }
+//
+//
+//
+//}