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/MemberCardController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index 3631210..09ffd92 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -2,9 +2,9 @@
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.MemberCard;
import com.doumee.service.business.MemberCardService;
import io.swagger.annotations.Api;
@@ -71,7 +71,7 @@
@PostMapping("/batchLoss")
@RequiresPermissions("business:membercard:update")
public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
- memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser());
+ memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -79,7 +79,7 @@
@PostMapping("/batchUnLoss")
@RequiresPermissions("business:membercard:update")
public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
- memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser());
+ memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(null));
return ApiResponse.success(null);
}
--
Gitblit v1.9.3