# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

Merge branch 'master_admin0117' of http://113.105.137.151:22280/youjj/cloud-platform into master_admin0117

修改：更新功能增加判断标识是否存在

增加来源类型

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

增加会员页面可查询标识

新增列表查询接口

接口标识查询：标识区分大小写

# Conflicts:
#	xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

# Conflicts:
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java