# Conflicts: # server-service/src/main/java/com/makeit/service/platform/space/PlatBedService.java # server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java