huige liantiao
原来recharge改topup。原来addon改recharge
删除教主提交的测试代码
merge
merge
merge
merge
merge
me
Merge branch 'master' of https://github.com/aisainfo-mler/dy-dealer.git

Conflicts:
	dealer-1/src/com/ai/mapp/sys/util/SYSConstant.java