Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-03 57f903e0eb21bd66c88ebc00ccc9d30b49d36f3e

 screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml

@@ -41,4 +41,17 @@
        where id = #{id}
    </update>

    <select id="selectAllAdjust" resultType="com.moral.api.pojo.dto.adjust.AdjustDTO">
        SELECT    de.`name` ,
                ds.id,
                de.mac,
                ds.`value`
        FROM
            device AS de
            LEFT JOIN device_adjust_value AS ds ON ds.mac = de.mac AND ds.sensor_code = #{code}  AND ds.is_delete =0
        WHERE
          de.monitor_point_id = #{id}
          AND de.is_delete = 0
    </select>

</mapper>