From 1e990aa104af5c4f8d218585121458f4a16744f7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 16 一月 2024 09:33:38 +0800
Subject: [PATCH] 扭矩工作曲线展示
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java | 10 +++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml | 2 +-
2 files changed, 6 insertions(+), 6 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..0552e7b 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
@@ -468,7 +468,7 @@
private String remark;
//鎵煩鍊�
- private float torqueValue;
+ private float torque;
//杩涚粰鍙傛暟
private String feedParameter;
@@ -996,12 +996,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() {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
index 8adc1de..efe16ba 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -40,7 +40,7 @@
<select id="getWorkLineList" resultType="org.jeecg.modules.mdc.dto.EquipmentMachingDto">
SELECT
torque_date CollectTime,
- torque_value,
+ torque_value torque,
feed_parameter
FROM
mdc_torque_config
--
Gitblit v1.9.3