修改UserVo
Merge branch 'master' of https://github.com/XESDog/XES_kupao

Conflicts:
	src/assets/db/config.rdb