From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
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