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

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

 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