Merge remote-tracking branch 'origin/master'

# Conflicts:
#	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java