From f1ec60de737efb5108c177e1618573be2a53f51f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 21 十一月 2023 10:04:30 +0800
Subject: [PATCH] 签审
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 3b0b8bb..bdea1c6 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,6 +7,7 @@
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;
@@ -28,7 +29,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;
/**
* 涓婚敭
@@ -47,16 +49,17 @@
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 25)
@ApiModelProperty("璁惧鍚嶇О")
private String equipmentName;
/**
- * 鏃ユ湡
+ * 鏃堕棿
*/
+ @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(value = "鏃ユ湡")
+ @ApiModelProperty(value = "鏃堕棿")
private Date torqueDate;
/**
@@ -69,7 +72,7 @@
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 15)
+ @Excel(name = "澶囨敞", width = 30)
@ApiModelProperty("澶囨敞")
private String notes;
@@ -103,6 +106,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