git checkout master
git pull https://gitee.com/guoliang47/distributedhardware_device_manager.git revert-merge-3-dm_dev
git push origin master