git checkout master
git pull https://gitee.com/lvhui123456/openGauss-connector-odbc.git merge_fix
git push origin master