Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-23 b9a5b68fab3428bb23c05ba3e0cab83afa1a82cb

 ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml

@@ -34,8 +34,8 @@
            <if test="query.planName != null and query.planName != ''">
                and t2.name like concat('%',#{query.planName},'%')
            </if>
            <if test="query.planId != null">
                and t2.id = #{query.planId}
            <if test="query.planType != null">
                and t2.type = #{query.planType}
            </if>
            <if test="query.startTime != null and query.startTime != ''">
                and t1.date >= #{query.startTime}