git checkout master
git pull https://gitee.com/lingchen163/vue-tao-admin.git revert-merge-7-master
git push origin master