department和CarDriver
Merge remote-tracking branch 'origin/master'

Conflicts:
	rentManagement/rentManagementWeb/pom.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	rentManagement/rentManagementWeb/src/main/webapp/js/config.js