From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
index 0552e7b..d4d641c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
@@ -7,6 +7,7 @@
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -76,6 +77,7 @@
     private String ALRMstate;
     //宸ヤ欢鍚嶇О
     private String ProductName;
+    private String ProductCount;
     //鏈哄簥X杞村潗鏍�
     private String Xmachine;
     //鏈哄簥Y杞村潗鏍�
@@ -153,6 +155,7 @@
 
     private String collectData;
 
+    private BigDecimal spindleCurrent;
 
     /*娴嬭瘯浣跨敤*/
     private String dataLine1;

--
Gitblit v1.9.3