rename the lists to list
merge
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-module-system/src/main/resources/META-INF/resources/view/car-module-system/security/user/edit-ui.jsp
	server/car-module-system/src/main/resources/META-INF/resources/view/car-module-system/security/user/page-grid.jsp