liang.chao ca2f94b2c7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml		2024-11-23 11:41:06 +08:00
..
bonus-material-mall	Merge remote-tracking branch 'origin/master'	2024-11-23 11:41:06 +08:00
pom.xml	设备信息，字典domain	2024-11-22 10:16:54 +08:00