vic
更改idproviderdao，修改了jdk6中integer转string与jdk7的不兼容
修改数据库地址，修改jdk7与6在integer与string类型转换的不兼容bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ceit/vic/platform/daoImpl/IDPROVIDERDaoImpl.java
	src/main/resources/jdbc.properties