fixed cashier
Merge branch 'master' of https://github.com/lkb123/cqas

merge sa last fix sa cashier
fix merge errors