From fe1801f4f3b9a3e2c9c0a7c1b004a9345be1b446 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 五月 2023 18:51:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |    4 ++++
 1 files changed, 4 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 a63b90b..7a33f08 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -24,6 +24,10 @@
 
     public CrnModeType modeType;
 
+    private String Barcode;
+
+    private boolean BarcodeResult;
+
     /**
      * 1 = 鎬ュ仠
      */

--
Gitblit v1.9.1