Merge branch 'hcp' into test

# Conflicts:
#	sys-api-service/src/main/java/com/xy/entity/MsgUserMessage.java