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 | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 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 6676982..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;
@@ -29,7 +28,8 @@
@TableName("mdc_torque_config")
@ApiModel(value = "mdc_torque_config瀵硅薄", description = "鎵煩閰嶇疆绠＄悊")
public class MdcTorqueConfig implements Serializable {
- private static final long serialVersionUID = 1L;
+
+ private static final long serialVersionUID = -8646261637017242975L;
/**
* 涓婚敭
@@ -48,34 +48,17 @@
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 25)
@ApiModelProperty("璁惧鍚嶇О")
private String equipmentName;
/**
- * 寮�濮嬫椂闂�
+ * 鏃堕棿
*/
- @Excel(name = "寮�濮嬫椂闂�", width = 15)
+ @Excel(name = "鏃堕棿", width = 30, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("寮�濮嬫椂闂�")
- private Date startTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @Excel(name = "缁撴潫鏃堕棿", width = 15)
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("缁撴潫鏃堕棿")
- private Date endTime;
-
- /**
- * 鏃ユ湡
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鏃ユ湡")
+ @ApiModelProperty(value = "鏃堕棿")
private Date torqueDate;
/**
@@ -86,9 +69,16 @@
private float torqueValue;
/**
+ * 杩涚粰鍙傛暟
+ */
+ @Excel(name = "杩涚粰鍙傛暟", width = 15)
+ @ApiModelProperty("杩涚粰鍙傛暟")
+ private String feedParameter;
+
+ /**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 15)
+ @Excel(name = "澶囨敞", width = 30)
@ApiModelProperty("澶囨敞")
private String notes;
@@ -122,6 +112,15 @@
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
+ @TableField(exist = false)
+ private String equipmentIds;
+
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
+
/**
* 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
*/
--
Gitblit v1.9.3