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

jinpengyong

2023-11-07 dab06e44d031aac4a951cfb01ba9545cc4772fa2

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

@@ -42,7 +42,7 @@
    LEFT JOIN
     sensor s
    ON
     s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0
     s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
    LEFT JOIN
   (
     SELECT