d
Merge branch 'master' of github.com:krestine/randomSelectProject
dd
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
	RandomSelectProject/src/main/java/com/project/dao/EvaluateMapper.java
	RandomSelectProject/src/main/java/com/project/dao/EvaluateMapper.xml
	RandomSelectProject/src/main/java/com/project/service/EvaluateService.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateServiceImpl.java