临时提交
Merge branch 'master' of local repository into zhangjl

Conflicts:
	src/com/ylbms/base/single/service/SingleInfoService.java