1､修改数据源配置
Merge branch 'master' of https://github.com/zhouda-genee/project

Conflicts:
	GeneeServiceFrameWork/src/jdbc_postgresql.properties
	GeneeTimerTaskFrameWork/src/jdbc_postgresql.properties