From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
index 76bcb44..01ba831 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
@@ -3,14 +3,12 @@
import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data;
-import org.springframework.stereotype.Component;
/**
* @author huang
* @since 2025/10/30
*/
@Data
-@Component
public class PlcBaseData {
/**
* plc
--
Gitblit v1.8.0