Merge remote-tracking branch 'origin/wyc624' into wyc624

# Conflicts:
#	src/main/java/com/zhentao/user/service/impl/UserLoginServiceImpl.java