From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml
index 6cb58c9..a795148 100644
--- a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml
@@ -161,7 +161,7 @@
WHEN di.time_type = 'DAY' THEN
TO_CHAR( di.create_time, 'DD' )
WHEN di.time_type = 'HOUR' THEN
- TO_CHAR( di.data_time, 'HH' )
+ TO_CHAR( di.data_time, 'HH24' )
ELSE TO_CHAR( di.data_time, 'YYMMDD' )
END AS dataTimeStr,
di.value,
--
Gitblit v1.9.3