查询条件脚本整理
权限模板添加
Merge branch 'master' of github.com:zhiyan/ZUI

Conflicts:
	demo/dist/js/ZUI.min.js
	dist/js/ZUI.min.js