111111
Merge branch 'master' of https://github.com/Tech-Code/admin.git

Conflicts:
	bus-web/src/main/resources/bus-dao.properties
	bus-web/src/main/resources/log4j.properties