撤销
git checkout master
git pull https://gitee.com/CGL-HHUC/ofdEditor.git revert-merge-30-master
git push origin master