计费模块与兼容修改
Merge branch 'master' of github.com:haryzhou/zixapp