From 4a13279fe13ad1cf6736670f6d1c5c61c8cba59b Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 12:41:11 +0800
Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0
---
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