From 3b21b61d28097c72811ce5a0a6a72b7722c68b1d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 二月 2025 11:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/BikesService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/BikesService.java b/server/services/src/main/java/com/doumee/service/business/BikesService.java
index 881b386..9aaf144 100644
--- a/server/services/src/main/java/com/doumee/service/business/BikesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/BikesService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -86,7 +88,7 @@
* @return PageData<Bikes>
*/
PageData<Bikes> findPage(PageWrap<Bikes> pageWrap);
-
+ String importBatch(MultipartFile file);
/**
* 鏉′欢缁熻
*
@@ -94,4 +96,8 @@
* @return long
*/
long count(Bikes bikes);
+
+ PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap);
+
+ void updateByJtt( Bikes m);
}
--
Gitblit v1.9.3