From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java | 12 +++++++-----
1 files changed, 7 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..2c1b4ef 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;
@@ -153,6 +154,7 @@
private String collectData;
+ private BigDecimal spindleCurrent;
/*娴嬭瘯浣跨敤*/
private String dataLine1;
@@ -468,7 +470,7 @@
private String remark;
//鎵煩鍊�
- private float torqueValue;
+ private float torque;
//杩涚粰鍙傛暟
private String feedParameter;
@@ -996,12 +998,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