Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

# Conflicts:
#	src/store/modules/permission.js