添加js验证
验证-段
修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/views/main/index.jsp
	WebContent/WEB-INF/views/szyzsq/sjcl.jsp
	WebContent/js/module/main/welcome-portlet.js
	src/com/renqiu/ggzy/service/SzyzsqManager.java