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/entity/MdcTorqueConfig.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
index 7232b35..873c326 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -62,18 +62,18 @@
private Date torqueDate;
/**
- * 鍙傛暟绫诲瀷
+ * 鎵煩鍊�
*/
- @Excel(name = "鍙傛暟绫诲瀷", width = 15)
- @ApiModelProperty("鍙傛暟绫诲瀷")
- private String argumentType;
+ @Excel(name = "鎵煩鍊�", width = 15)
+ @ApiModelProperty("鎵煩鍊�")
+ private float torqueValue;
/**
- * 鍙傛暟鍊�
+ * 杩涚粰鍙傛暟
*/
- @Excel(name = "鍙傛暟鍊�", width = 15)
- @ApiModelProperty("鍙傛暟鍊�")
- private float torqueValue;
+ @Excel(name = "杩涚粰鍙傛暟", width = 15)
+ @ApiModelProperty("杩涚粰鍙傛暟")
+ private String feedParameter;
/**
* 澶囨敞
--
Gitblit v1.9.3