git checkout master
git pull https://gitee.com/jiangsion/farris-vue.git feat/combolist
git push origin master