From f95a3c836f06078f41389051a9d1c01969a925cb Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 20 三月 2026 11:28:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shhtgcwcs' into shhtgcwcs

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

diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index fff8bc1..c28c09b 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -192,6 +192,16 @@
      */
     private Integer crnLane = 1;
 
+    /**
+     * 鏃ュ織閲囬泦鏃堕棿
+     */
+    private Long deviceDataLog = System.currentTimeMillis();
+
+    /**
+     * 涓婁竴娆℃寚浠や笅鍙戞椂闂�
+     */
+    private Long lastCommandTime = System.currentTimeMillis();
+
     public void setMode(Short mode) {
         this.mode = mode;
         this.modeType = CrnModeType.get(mode);

--
Gitblit v1.9.1