Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-07 0e12140d6ceac7fa10093df2d3ca395ee1501386

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

@@ -251,7 +251,11 @@
    <delete id="deleteTMonitorById" parameterType="Long">
        delete
        from t_monitor
        where id = #{id}
        <where>
            <if test="id !=null">
                id = #{id}
            </if>
        </where>
    </delete>

    <delete id="deleteTMonitorByIds" parameterType="String">