Merge branch 'qyn' of yinet2020/jeesite into master

modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java

@@ -142,7 +142,7 @@ public class ArticleController extends BaseController {
 		CmsUtils.addViewConfigAttribute(model, article.getCategory());
 		return "modules/cms/articleForm";
 	}
-	
+
 	/**
 	 * 保存文章表
 	 */
@@ -189,4 +189,11 @@ public class ArticleController extends BaseController {
 		return renderResult(Global.TRUE, text("删除文章表成功！"));
 	}
 
-}
+	@RequestMapping(value = "deskData")
+	public List<Article> deskData(Article article) {
+		return articleService.findList(article);
+	}
+
+
+
+}

modules/cms/src/main/resources/views/modules/jmdxmh/zxzx/zxzx.html

@@ -151,7 +151,7 @@
 
                 <div style="width:48%">
                     <div style="width:100%;height: 42px;border-bottom: 2px solid #ccc;margin-bottom: 10px;display: flex;justify-content: space-between;align-items: center;">
-                        <h4 style="border-bottom: 2px solid #459fff;width:120px;text-align: center;padding-bottom: 10px;margin-bottom: -2px;font-weight: bold;"><a style="color: #459fff;text-decoration:none;">新闻动态</a></h4>
+                        <h4 style="border-bottom: 2px solid #459fff;width:120px;text-align: center;padding-bottom: 10px;margin-bottom: -2px;font-weight: bold;"><a style="color: #459fff;text-decoration:none;">新闻周刊</a></h4>
                         <a  href="/js/f/list-hbjmdx005" style="text-decoration: none;color: #459fff">更多<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
                     </div>
                     <div>