# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java
#	YeeAmosFireAutoSysStart/src/main/resources/application.properties