From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

---
 screen-manage/src/main/resources/mapper/VersionMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 44aad20..4d76182 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/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

--
Gitblit v1.8.0