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

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.xml
d
sss
d
d
d
ss
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/AdminController.java
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.java
	RandomSelectProject/src/main/java/com/project/dao/RestntMapper.xml
	RandomSelectProject/src/main/java/com/project/service/RestntService.java
	RandomSelectProject/src/main/java/com/project/service/RestntServiceImpl.java
	RandomSelectProject/src/main/webapp/WEB-INF/views/admin/restntInfo.jsp
oi