Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-03 088bc1e162261a91a8779d8079bef9d6a5d6d3e9

 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml

@@ -508,10 +508,14 @@
               #{query.keyword} as keyword
        FROM
            t_monitor tm
                INNER JOIN t_yw_point yp ON yp.serial_number = tm.serial_number
        <where>
            <if test="query.keyword != null and query.keyword != ''">
                AND tm.name like concat('%', #{query.keyword}, '%')
            </if>
            <if test="query.startTIme != null and query.endTime != null">
                AND yp.create_time between #{query.startTime} and #{query.endTime}
            </if>
        </where>
    </select>