修改了bug
1-判断数据类型的bug
2-判断主键的bug
3-jar包
4-计算元数据模式的bug
5-生成指标信息的bug
临时修改
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	WebContent/asIndexTemp.jsp
	WebContent/login/login.jsp
	WebContent/login/register.jsp