第一次上传到本地库
Merge branch 'master' of github.com:killkiss/wqcg

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/org.eclipse.jdt.core.prefs
	WebRoot/WEB-INF/classes/dbconfig.properties
	WebRoot/WEB-INF/classes/jeecg/jeecg_database.properties
	WebRoot/WEB-INF/classes/log4j.properties
	WebRoot/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp
	WebRoot/webpage/system/user/userList.jsp
	resources/dbconfig.properties
	resources/jeecg/jeecg_database.properties
	resources/log4j.properties
	src/jeecg/system/controller/core/LoginController.java
JAR包