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

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/MenuMapper.java
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateService.java
	RandomSelectProject/src/main/java/com/project/service/MenuService.java
	RandomSelectProject/src/main/java/com/project/service/MenuServiceImpl.java
	RandomSelectProject/src/main/java/com/project/service/RestntService.java
	RandomSelectProject/src/main/java/com/project/service/RestntServiceImpl.java
kakaka
pull
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/MemberMapper.xml
	RandomSelectProject/src/main/java/com/project/dao/MenuMapper.xml
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateService.java
	RandomSelectProject/src/main/java/com/project/service/RestntService.java
	RandomSelectProject/src/main/java/com/project/service/RestntServiceImpl.java
full power bioman
dd
weesadf
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	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
dd
qq