Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java

@@ -452,7 +452,7 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
         sCleanRecords.setStatus(CleaningStatusEnum.CLEANED.getCode());
         SRoom sRoom = new SRoom();
         sRoom.setIsDirtyRoom(YesNoEnum.no.getIndex());
-        sRoom.setId(sCleanRecords.getRoomId());
+        sRoom.setId(baseMapper.selectById(sCleanRecords.getId()).getRoomId());
         sRoomMapper.updateById(sRoom);
         SCleanRecords records = baseMapper.selectSCleanRecordsById(sCleanRecords.getId());
         if (records == null) {