쬐
Merge branch 'master' of https://github.com/krestine/randomSelectProject.git
아직 멀었다.
Merge branch 'master' of https://github.com/krestine/randomSelectProject.git
안바
아야어
Merge branch 'master' of https://github.com/krestine/randomSelectProject.git
지우고 지우
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/java/com/project/domain/EvaluateDTO.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateService.java
오
Merge branch 'master' of https://github.com/krestine/randomSelectProject.git
쿼리문 이상
일단 여기까
오
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.xml
친구가 평가한 식당리스트 뽑
Merge branch 'master' of https://github.com/krestine/randomSelectProject.git