dd
Merge branch 'master' of github.com:krestine/randomSelectProject
kj
d
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.xml
	RandomSelectProject/src/main/webapp/WEB-INF/views/admin/restntInfo.jsp
k
Merge branch 'master' of github.com:krestine/randomSelectProject
jj
Merge branch 'master' of github.com:krestine/randomSelectProject
j