From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 08 七月 2025 11:54:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 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 bdea1c6..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 @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -70,6 +69,13 @@ private float torqueValue; /** + * 杩涚粰鍙傛暟 + */ + @Excel(name = "杩涚粰鍙傛暟", width = 15) + @ApiModelProperty("杩涚粰鍙傛暟") + private String feedParameter; + + /** * 澶囨敞 */ @Excel(name = "澶囨敞", width = 30) -- Gitblit v1.9.3