Merge remote-tracking branch 'origin/master'

lin

2024-02-28 92a3b953f2da493e68afb9ae73a15b6513a6c18a

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

@@ -552,6 +552,7 @@
        <if test="article.eventType != null">
            and jpd.event_type = #{article.eventType}
            and jpd.end_time is not null
            and jpd.end_time &lt;= SYSDATE()
        </if>

        <if test="article.propertyFlag!=null ">