Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

 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