Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -299,6 +299,9 @@
        <if test="beginTime!=null and beginTime!=''">
            and t1.alarm_time between #{beginTime} and #{endTime}
        </if>
        <if test="type!=null">
            and t3.type = #{type}
        </if>
        group by t1.id
        order by t1.id desc
    </select>