jedis
重构
dbconfig
Merge branch 'master' of https://github.com/openif/ticdic

Conflicts:
	pom.xml
	src/main/java/com/openif/ticdic/controller/DictController.java
	src/main/java/com/openif/ticdic/controller/ItemController.java
	src/main/webapp/WEB-INF/dispatcher-servlet.xml