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/properties/SlaveProperties.java | 4 ++++
1 files changed, 4 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..2d19ada 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -31,6 +31,8 @@
private List<DevpSlave> devp = new ArrayList<>();
+ private List<Devp2Slave> devp2 = new ArrayList<>();
+
private List<Slave> barcode = new ArrayList<>();
private List<LedSlave> led = new ArrayList<>();
@@ -41,4 +43,6 @@
private List<ShuttleSlave> shuttle = new ArrayList<>();
+ private List<LiftSlave> lift = new ArrayList<>();
+
}
--
Gitblit v1.9.1