测试
代码
Original
测试Merge
测试Merge
Merge branch 'master' of http://10.131.252.71/git/g3
测试强Push
测试强推
Merge branch 'master' of http://10.131.252.71/git/g3

Conflicts:
	Resolved.txt
去除错误的Error提示
修正算分，可以调方差
Merge branch 'master' of http://10.131.252.71/git/g3
单题评分
修正JOIN FETCH导致的严重性能问题
所有直接处理都扔至Dao中，由Action直接管理
Merge branch 'master' of https://github.com/GeniusYe/StudentManage

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/WEB-INF/classes/applicationContext_action.xml
	WebRoot/WEB-INF/classes/applicationContext_service.xml
	WebRoot/WEB-INF/classes/applicationContext_util.xml
	WebRoot/WEB-INF/classes/struts-userInActionMapping.xml
	WebRoot/login.html
	src/applicationContext_action.xml
	src/applicationContext_service.xml
	src/applicationContext_util.xml
	src/com/score/action/CalculateScoreAction.java
	src/com/score/action/CreateCollectionItemAction.java
	src/com/score/action/CreateCollectionItemCheckAction.java
	src/com/score/action/CreateCollectionItemPublicitySetAction.java
	src/com/score/action/CreatePublicHearingsItemAction.java
	src/com/score/action/DeleteCollectionItemAction.java
	src/com/score/action/DeleteCollectionItemInfoImageAction.java
	src/com/score/action/DeletePublicHearingsItemAction.java
	src/com/score/action/FillCollectionItemInfoAction.java
	src/com/score/action/FillCollectionItemInfoCheckAction.java
	src/com/score/action/FillCollectionItemInfoImageAction.java
	src/com/score/action/FillPublicHearingsItemInfoAction.java
	src/com/score/action/QueryCollectionItemAction.java
	src/com/score/action/QueryCollectionItemInfoImageAction.java
	src/com/score/action/QueryCollectionItemInfoImageOneAction.java
	src/com/score/action/QueryCollectionItemOneAction.java
	src/com/score/action/QueryItemWhichShallBePublicizedAction.java
	src/com/score/action/QueryPublicHearingsItemAction.java
	src/com/score/action/QueryPublicHearingsItemOneAction.java
	src/com/score/action/QueryPublicHearingsTextAction.java
	src/com/score/action/QueryScoreByItemIdAction.java
	src/com/score/action/QueryUserOutWithItemInfoAction.java
	src/com/score/action/QueryUserOutWithPublicHearingsItemInfoAndTextAction.java
	src/com/score/bean/CollectionItem.java
	src/com/score/dao/CollectionItemDao.java
	src/com/score/dao/CollectionItemInfoCheckDao.java
	src/com/score/dao/CollectionItemInfoDao.java
	src/com/score/dao/CollectionItemScoreDao.java
	src/com/score/dao/PublicHearingsItemDao.java
	src/com/score/dao/PublicHearingsItemInfoDao.java
	src/com/score/dao/PublicHearingsItemInfoTextDao.java
	src/com/score/dao/PublicHearingsItemScoreDao.java
	src/com/score/dao/SysUserDao.java
	src/com/score/dao/TotalScoreDao.java
	src/com/score/service/CalculateScoreService.java
	src/com/score/service/CollectionItemInfoCheckService.java
	src/com/score/service/CollectionItemInfoImageService.java
	src/com/score/service/CollectionItemInfoService.java
	src/com/score/service/CollectionItemScoreService.java
	src/com/score/service/GenerateReportService.java
	src/com/score/service/PublicHearingsItemInfoService.java
	src/com/score/service/PublicHearingsItemInfoTextService.java
	src/com/score/service/PublicHearingsItemScoreService.java
	src/struts-userInActionMapping.xml
	鏈夊緟鎻愰珮.txt