Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2400238fd8ae34a2f10a4ea35db9b1739c534a7e

 ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml

@@ -32,6 +32,7 @@
        <result property="operatorExpired" column="operator_expired"/>
        <result property="camMaxVisibleDistance" column="cam_max_visible_distance"/>
        <result property="camAlarmGuideEnable" column="cam_alarm_guide_enable"/>
        <result property="state" column="state"/>
    </resultMap>

    <sql id="selectArdCamerasVo">
@@ -61,7 +62,8 @@
               c.operator_id,
               c.operator_expired,
               c.cam_max_visible_distance,
               c.cam_alarm_guide_enable
               c.cam_alarm_guide_enable,
               c.state
        from ard_cameras c
                 left join sys_dept d on d.dept_id = c.dept_id
                 left join sys_user u on u.user_id = c.user_id
@@ -236,6 +238,7 @@
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="operatorId != null">operator_id = #{operatorId},</if>
            <if test="operatorExpired != null">operator_expired = #{operatorExpired},</if>
            <if test="state != null">state = #{state},</if>
        </trim>
        where id = #{id}
    </update>