修改了card type
增加了card的expense方法
fix bug
Merge branch 'master' into wxttt