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

cjl

2023-11-14 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1

 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>