From a68bf17ab81df98882e19b79628e6876bb260468 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 18 六月 2025 10:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index ff4f254..1e295f1 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,6 +1,5 @@
package com.zy.core.properties;
-import com.zy.core.Slave;
import com.zy.core.model.*;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -23,9 +22,9 @@
private int groupCount;
- private List<LedS> Led = new ArrayList<>();
+ private List<LedSlave> Led = new ArrayList<>();
- private List<DevpSlave> devpSlave = new ArrayList<>();
+ private List<DevpSlave> devp = new ArrayList<>();
private List<ShuttleSlave> shuttle = new ArrayList<>();
--
Gitblit v1.9.1