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