取消自动部署流程
Merge branch 'master' of https://github.com/adsl0001/renqiu.git

Conflicts:
	src/com/renqiu/ggzy/service/SzyzsqManager.java