# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml