From 2bd0f5e053cfe4dd90d6a5123474c9b41bcee94e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 11 十一月 2023 17:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 8ba2510..774d3b7 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -78,7 +78,7 @@
// 鎵爜澶辫触
private boolean barcodeErr;
- //鍑哄叆搴撴ā寮�
+ //鍑哄叆搴撴ā寮�1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
//杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
--
Gitblit v1.9.1