1
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git

Conflicts:
	src/main/java/com/mybao123/service/IndexService.java
1
1
Merge branch 'master' of https://github.com/mybao123/mybao123-web.git

Conflicts:
	src/main/java/com/mybao123/dao/BaseDao.java