Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030

jinpengyong

2023-10-31 a860a554680453f533328858a525e663a22e86ed

 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>