mege new code form dev
git checkout master
git pull https://gitee.com/fuckSony/cockroach-iot.git dev
git push origin master