在结算付款交易记录中增加退货交易的显示
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
增加售卡的付款方式，针对售卡和充值