From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/resources/mapper/DeviceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index 762cfa8..359ec1b 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -42,7 +42,7 @@
cast( t1.`value` -> '$.a99054' AS DOUBLE ) AS a99054
FROM
device t
- LEFT JOIN history_minutely_202401 t1 ON t1.mac = t.mac
+ LEFT JOIN history_minutely_${mon} t1 ON t1.mac = t.mac
WHERE
t.organization_id = #{id}
AND date(t1.time) <![CDATA[=]]> #{startTime}
--
Gitblit v1.8.0