From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index b2de3cc..abda196 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -39,8 +39,8 @@
<foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
#{mac}
</foreach>
- AND `time` <![CDATA[>=]]> #{start}
- AND `time` <![CDATA[<]]> #{end}
+ AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[>=]]> #{start}
+ AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[<]]> #{end}
ORDER BY `time`
</select>
<select id="deviceList" resultType="java.util.Map">
--
Gitblit v1.8.0