提交

提交
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/IZiliaoService.java
	src/main/java/com/royal/dealer/web/service/imp/ZiliaoService.java
111
Merge branch 'master' of https://github.com/succour/leicaproxy