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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 237b5ac..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;
@@ -468,7 +471,7 @@
private String remark;
//鎵煩鍊�
- private float torqueValue;
+ private float torque;
//杩涚粰鍙傛暟
private String feedParameter;
@@ -996,12 +999,12 @@
this.remark = remark;
}
- public float getTorqueValue() {
- return torqueValue;
+ public float getTorque() {
+ return torque;
}
- public void setTorqueValue(float torqueValue) {
- this.torqueValue = torqueValue;
+ public void setTorque(float torqueValue) {
+ this.torque = torqueValue;
}
public String getFeedParameter() {
--
Gitblit v1.9.3