From d39480501976a24d3749048e728e80cb1d01145b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 二月 2023 19:38:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

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

diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index ad33be5..df80422 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -34,6 +34,10 @@
 
         private Integer barcode;
 
+        private Integer barcode1;
+
+        private Integer barcode2;
+
     }
 
 }

--
Gitblit v1.9.1