# Conflicts: # share-system/src/main/resources/mapper/system/DeviceLogMapper.xml # share-system/src/main/resources/mapper/system/DeviceStatusLogMapper.xml # share-system/src/main/resources/mapper/system/SRoomMapper.xml
