git dev合并到master

将dev合并到master

git merge develop

将合并完的分支push到远程仓库

git push origin master