合并国庆之后的代码
git checkout master
git pull https://gitee.com/fuckSony/cockroach-iot.git dev
git push origin master