From 2e9ac6878d3d7a59c200be7d74811c89dadf3a44 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 06 一月 2024 10:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 43785ec..a41e004 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -40,9 +40,9 @@
             index++ ;
             dt = ByteUtil.BCD2String_BE(bs, index, index) + ":" + dt ;//鍒�
             index++ ;
-            dt = ByteUtil.BCD2String_BE(bs, index, index) + " " + dt ;//鏃�
+            dt = ByteUtil.BCD2String_BE(bs, index, index) + ":" + dt ;//鏃�
             index++ ;
-            dt = ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//鏃�
+            dt = ByteUtil.BCD2String_BE(bs, index, index) + " " + dt ;//鏃�
             index++ ;
             bs[index] = (byte)(bs[index] & 0x10);
             dt = ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//鏈�

--
Gitblit v1.8.0