Merge branch 'dev-20190827-account-center' into release

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/Test.java
#	server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.java
#	server/src/main/resources/mybatis/AccountInfoEntityMapper.xml