更改了销售明细表
Merge branch 'master' of https://github.com/cylong1016/NJULily

Conflicts:
	src/main/java/businesslogic/common/Info.java