# Conflicts: # amos-boot-system-equip/src/main/resources/application-dev.properties
# Conflicts: # amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java # amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
