解决冲突
lund
Merge branch 'master' of https://github.com/A8MG/QDPay.git

Conflicts:
	QDM/src/com/a8/qdm/query/dao/ActiveDao.java
	QDM/src/com/a8/qdm/query/dao/impl/ActiveDaoImpl.java
	QDM/src/com/a8/qdm/query/service/ActiveService.java
	QDM/src/com/a8/qdm/query/service/impl/ActiveServiceImpl.java
添加渠道功能
lund