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

jinpengyong

2021-06-23 df2f2b669f4196f599ca4db91917314ddc4ed94f

 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