Merge branch 'develop1.0' into zhangjw_form_develop1.0

zhang

2025-04-18 79e5f89924577aee65b6127e0d7966ffb0e5fdc4

 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,