From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 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