Merge branch 'dev-1110' into release

# Conflicts:
#	client/pom.xml
#	server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java