# Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocLibraryService.java

Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp

# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

# Conflicts:
#	amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml