# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java
#	amos-boot-system-equip/src/main/resources/application-dev.properties
#	amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
#	amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml