From 4e7e747d2a594b9f68d2d45b90bebc401d77724e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 19:01:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

---
 server/services/src/main/java/com/doumee/service/business/MemberRidesService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index f37680e..c9ec41d 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -2,6 +2,7 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Bikes;
 import com.doumee.dao.business.model.Locks;
 import com.doumee.dao.business.model.MemberRides;
 import com.doumee.dao.business.web.request.MemberRidesQuery;
@@ -115,7 +116,7 @@
      * @param memberId
      * @return
      */
-    String getOnlineBike(String memberId);
+    MemberRides getOnlineBike(String memberId);
 
     /**
      * 鎵爜瑙i攣

--
Gitblit v1.9.3