diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx b/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx
index a9f1e7d0..89964fe9 100644
Binary files a/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx and b/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx differ
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java
index 71015c4e..3fb1e764 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java
@@ -313,7 +313,7 @@ public class FrontController extends BaseController {
 	@RequestMapping(value = "comment-{theme}", method = RequestMethod.GET)
 	public String comment(Comment comment, @PathVariable String theme, HttpServletRequest request, HttpServletResponse response,
 			Model model) {
-		Page<Comment> page = new Page<Comment>(request, response);
+		Page<Comment> page = new Page<>(request, response);
 		Comment c = new Comment();
 		c.setCategory(comment.getCategory());
 		c.setArticleId(comment.getArticleId());
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java
index b625c84a..21955790 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java
@@ -56,7 +56,7 @@ public class FrontSearchController extends BaseController{
 			
 			// 文章检索
 			if (StringUtils.isBlank(t) || "article".equals(t)){
-				Page<Map<String, Object>> page = new Page<Map<String, Object>>(request, response);
+				Page<Map<String, Object>> page = new Page<>(request, response);
 				Map<String, String> parmas = MapUtils.newHashMap();
 				if (StringUtils.isNotBlank(siteCode)){
 					parmas.put("siteCode", siteCode);
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java
index 5961bb1e..efa533e5 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java
@@ -53,10 +53,10 @@ public class UserController extends BaseController {
 	@ResponseBody
 	public Page<User> listData(User user, HttpServletRequest request, HttpServletResponse response) {
 //		if (User.USER_TYPE_NONE.equals(user.getUserType())){
-//			return new Page<User>(request, response);
+//			return new Page<>(request, response);
 //		}
 		if (Global.isStrictMode() && !user.currentUser().isAdmin()){
-			return new Page<User>(request, response);
+			return new Page<>(request, response);
 		}
 		user.setPage(new Page<>(request, response));
 		Page<User> page = userService.findPage(user);
diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
index eb45e15a..4110d959 100644
--- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
@@ -178,7 +178,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
 			System.out.println("============ 分页测试，查询子节点 ============");
 			Company company4 = new Company("1");
 			company4.setFullName(company.getFullName());
-			company4.setPage(new Page<Company>(1, 2));
+			company4.setPage(new Page<>(1, 2));
 			company4.setIsQueryChildren(true);
 			List<Company> companyListPage = companyDao.findList(company4);
 			Assert.assertEquals("find page list size", companyListPage.size(), 2);