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

lizijie

2022-01-24 90d352e2af12d96ea09b0062d8cb6e0d184cbb3f

 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