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