Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml

@@ -72,7 +72,7 @@
        from jczz_article
        where is_deleted = 0
        and publish = 1
        <if test="article.articleType != null">
        <if test="article.articleType != null and article.articleType != ''">
          and  article_type = #{article.articleType}
        </if>
        order by create_time desc