git checkout master
git pull https://gitee.com/leelou/jfinal-weixin.git revert-merge-12-master
git push origin master