Revert "Merge branch 'master' of https://github.com/cylong1016/NJULily"

Conflicts:
	.classpath
	document/详细设计描述文档/进销存-软件详细设计描述文档.docx
最后试一次
Merge branch 'master' of https://github.com/cylong1016/NJULily

Conflicts:
	.classpath