git checkout master
git pull https://gitee.com/zhang_shaojie/gitResorce.git revert-merge-3-follow1
git push origin master