标签修复
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Article新增heat字段
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git

Conflicts:
	CreateDB.sql
	WebRoot/QA.jsp
	WebRoot/QA_Answer.jsp
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/RecordinfoDaoImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/RecordinfoDao.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/Impl/RecordinfoServiceImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/RecordinfoService.class
	WebRoot/WEB-INF/classes/com/ISharing/ORM/Recordinfo.class
	WebRoot/WEB-INF/classes/com/ISharing/ORM/Recordinfo.hbm.xml
	WebRoot/WEB-INF/classes/com/ISharing/Tool/ConstFigure.class
	src/com/ISharing/IDao/RecordinfoDao.java
	src/com/ISharing/IService/RecordinfoService.java
	src/com/ISharing/ORM/Recordinfo.hbm.xml
	src/com/ISharing/Tool/ConstFigure.java

Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>