修改现金券结算，增加结算类型
merge code
修改现金券结算
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard