改了下ioc,,,,,,,,,
两个流程
........
Merge branch 'master' of https://github.com/caining618/ytf_opcron.git

Conflicts:
	src/main/resources/context/spring/applicationContext-quartz.xml
391