# Conflicts:
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.class
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/vo/AuthorityMenuTree.class
#	ace-modules/ace-admin-api/target/classes/com/github/wxiaoqi/security/admin/vo/MenuTree.class
#	ace-modules/ace-generator/target/classes/application.yml
#	ace-modules/ace-generator/target/classes/com/github/wxiaoqi/security/generator/service/GeneratorService.class
#	ace-modules/ace-generator/target/classes/generator.properties
#	ace-modules/ace-generator/target/classes/mapper/GeneratorMapper.xml
#	ace-modules/ace-generator/target/classes/template/controller.java.vm
#	ace-modules/ace-generator/target/classes/template/entity.java.vm
#	ace-modules/ace-generator/target/classes/template/mapper.java.vm
#	ace-modules/ace-generator/target/classes/template/mapper.xml.vm