修改密码服务
修改pos密码判断
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修改现金券退货问题
修改结算付款中有退货费率的问题
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
捕获现金券消费通知异常
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
修正前值交易费率4位小数
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
增加券包购买数量限制
Merge branch 'master' of https://github.com/cardsystem/our-card-system into 20131219-cpucard
merge code