From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
index 2c7c785..5334b06 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
@@ -3,9 +3,9 @@
 import com.doumee.api.BaseController;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
 import com.doumee.dao.business.model.CarDriver;
 import com.doumee.service.business.CarDriverService;
 import io.swagger.annotations.Api;
@@ -14,9 +14,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author 姹熻箘韫�
@@ -42,7 +39,7 @@
     @GetMapping("/delete/{id}")
     @RequiresPermissions("business:cardriver:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
-        carDriverService.deleteById(id);
+        carDriverService.deleteById(id,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -50,7 +47,7 @@
     @GetMapping("/delete/batch")
     @RequiresPermissions("business:cardriver:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        carDriverService.deleteByIdInBatch(this.getIdList(ids));
+        carDriverService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 

--
Gitblit v1.9.3