git checkout master
git pull https://gitee.com/mingSoft/MCMS.git revert-merge-238-master
git push origin master