From bb748f7f3dc15af31953a20200b1564fb77bfd7a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 22 十一月 2024 13:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 4d026aa..7bf463d 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -31,6 +31,10 @@
private List<DevpSlave> devp = new ArrayList<>();
+ private List<Devp2Slave> devp2 = new ArrayList<>();
+
+ private List<Devp2Slave> devp3 = new ArrayList<>();
+
private List<Slave> barcode = new ArrayList<>();
private List<LedSlave> led = new ArrayList<>();
@@ -41,4 +45,6 @@
private List<ShuttleSlave> shuttle = new ArrayList<>();
+ private List<LiftSlave> lift = new ArrayList<>();
+
}
--
Gitblit v1.9.1