结算方式增加卡号
增加贴近调工费
FIX BUG，抹零和折扣的BUG
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'