把sale更改了一下…
Merge branch 'master' of https://github.com/cylong1016/NJULily

Conflicts:
	src/main/java/businesslogic/salebl/Sale.java