git checkout v1.6.5
git pull https://gitee.com/wang-xh-nancy/farris-vue.git combine_view
git push origin v1.6.5