From f9c42e6879387bdad34e714d7a91add2bb182934 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 10 七月 2023 11:23:53 +0800
Subject: [PATCH] 扭矩配置导入导出分页列表接口bug修复
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 9501577..5162f82 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
@@ -48,13 +48,14 @@
/**
* 璁惧鍚嶇О
*/
- @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 = "鏃堕棿")
@@ -70,7 +71,7 @@
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 15)
+ @Excel(name = "澶囨敞", width = 30)
@ApiModelProperty("澶囨敞")
private String notes;
@@ -104,6 +105,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