borderimage 修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/cashier.css