From 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8 Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Thu, 18 Apr 2024 14:01:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev --- 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