From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +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 | 11 ++++++++++-
1 files changed, 10 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 716c4ba..4e5d3f1 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
@@ -1,8 +1,13 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
+import lombok.extern.java.Log;
+import org.apache.shiro.authz.annotation.Logical;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -86,7 +91,7 @@
* @return PageData<Bikes>
*/
PageData<Bikes> findPage(PageWrap<Bikes> pageWrap);
-
+ String importBatch(MultipartFile file);
/**
* 鏉′欢缁熻
*
@@ -96,4 +101,8 @@
long count(Bikes bikes);
PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap);
+
+ void updateByJtt( Bikes m);
+
+ List<Bikes> getEleBikes(String memberId);
}
--
Gitblit v1.9.3