机具
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/java/com/yeepay/ytf/term/action/DictAction.java
	src/main/java/com/yeepay/ytf/term/dao/query/DictDao.java
	src/main/java/com/yeepay/ytf/term/model/Dict.java
	src/main/java/com/yeepay/ytf/term/service/DictService.java
	src/main/java/com/yeepay/ytf/term/service/DictServiceImpl.java
	src/main/webapp/WEB-INF/xutils-webapp_term.xml
	src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/caining618/ytf_cust.git