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

jiaosong

2023-11-03 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6

 server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java

@@ -104,6 +104,7 @@
                    bikes.setBackLockId( lockid);
                    bikes.setBackSiteId( siteid);
                    bikes.setBackCommondId(logId);
                    bikes.setStatus(pjson.getInteger("status"));
                    result = memberRidesService.mqttCloseBikeEvent(bikes);
                    logInfo = "mqtt消息订阅还车消息";
                    log.info("mqtt消息订阅=========还车==========成功");