经销商数据

经销商数据
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/royal/dealer/web/controller/AccessControl.java
	src/main/java/com/royal/dealer/web/service/imp/DealerService.java
	src/main/webapp/view/manager/dealer.jsp