share-system/src/main/java/share/system/domain/SRoom.java · fbc0d45955a3af5aca0f6666797e3f38ead014a8 · pseer / gxpt_ht

Merge branch 'dev_lch' into dev · 0c1ed350

# 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

authored Jan 25, 2024

0c1ed350

SRoom.java 3.09 KB

Replace SRoom.java