Merge remote-tracking branch 'origin/release' into dev-hospital-0412

# Conflicts:
#	client/pom.xml
#	common/pom.xml
#	server/pom.xml
#	server/src/main/java/com/pica/cloud/account/account/server/service/HospitalSaasUserService.java