From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/A5Frame.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/A5Frame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/A5Frame.java
index 656a432..31455ff 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/A5Frame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/A5Frame.java
@@ -51,10 +51,13 @@
 
     @Override
     public String toString() {
-        return "A5Frame{" +
-                "orderType='" + orderType + '\'' +
-                ", payloadLength='" + payloadLength + '\'' +
-                ", payload='" + payload + '\'' +
-                '}';
+//        return "A5Frame{" +
+//                "orderType='" + orderType + '\'' +
+//                ", payloadLength='" + payloadLength + '\'' +
+//                ", payload='" + payload + '\'' +
+//                '}';
+        return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode()
+                + FunctionCodeEnum.DATA_TRANSPORT_DATA.getCode()
+                + orderType + payloadLength + payload;
     }
 }

--
Gitblit v1.9.3