新建项目方式修改
Merge branch 'master' of github.com:antme/pms
Merge branch 'master' of github.com:antme/pms
创建项目方式修改
Merge branch 'master' of github.com:antme/pms

Conflicts:
	web/js/salescontract/addsc.js