zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
..
Api 抵扣通知
Behavior initial
Common 将官方渠道修改为江息网络
Conf 回滚测试
Controller 修改短信接口
Model initial
index.html initial