add channle relation configuration for charge
Merge branch 'master' of github.com:momoplan/mgr
update channel relation configuration for charge
fix autoTransfer bug
新增渠道预警发短信定时任务
update aoto Transter bug
Merge branch 'master' into lichenxing

Conflicts:
	src/main/resources/META-INF/spring/mgr.properties