Merge branch 'feature/20171030' of...

Merge branch 'feature/20171030' of http://gitabc.xyqb.com/head_group/xyqb-user2 into feature/20171030

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java