From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0

---
 src/main/java/com/zy/core/model/DeviceMsgModel.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/model/DeviceMsgModel.java b/src/main/java/com/zy/core/model/DeviceMsgModel.java
index 4895346..ca64719 100644
--- a/src/main/java/com/zy/core/model/DeviceMsgModel.java
+++ b/src/main/java/com/zy/core/model/DeviceMsgModel.java
@@ -7,6 +7,12 @@
 
     private Integer deviceId;
 
+    private String deviceMsgType;
+
     private Object deviceMsg;
 
+    private String deviceOriginMsg;
+
+    private String resultKey;
+
 }

--
Gitblit v1.9.1