fix deploy.sh conflict
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git