Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 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);

    /**
     * 扫码解锁
@@ -138,4 +139,6 @@
    int mqttCloseBikeEvent(MemberRides bikes);

    int mqttLockInfoEvent(Locks locks);

    void autoRefreshLockStatus();
}