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

jinpengyong

2023-11-14 931734244f977a65dd35c6f606afb999d7c3c967

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

@@ -52,6 +52,7 @@
        WHERE
          de.monitor_point_id = #{id}
          AND de.is_delete = 0
    order by de.dev_num,de.id
    </select>

</mapper>