# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml