Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/ArticleMapper.java

@@ -27,4 +27,6 @@
    IPage<WebArticleVo> selectWebArticleInPage(Page<WebArticleVo> page, @Param("record") ArticleEntity articleEntity);

    List<Long> selectArticleIdsByColumnId(@Param("columnId") Long columnId, @Param("companyId") Long companyId, @Param("type") Integer type);

    List<ArticleEntity> selectArticleByColumnId(@Param("columnId") Long columnId, @Param("companyId") Long companyId, @Param("type") Integer type);
}