git checkout master
git pull https://gitee.com/chenjingwei1112/umdk_1.git merge_1117
git push origin master