From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +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