Merge branch 'feature/3.9.0' of http://47.107.153.111:8081/gitlab/chenweijian/hilo-user into feature/3.9.0
