From 3f55d897a99de7befb7c9264053d312543b5634f Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期三, 05 七月 2023 14:20:55 +0800
Subject: [PATCH] 修改扭矩配置管理3
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 8615f0b..3b0b8bb 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
@@ -40,43 +40,43 @@
/**
* 璁惧缂栧彿
*/
- @Excel(name = "璁惧缂栧彿",width = 15)
+ @Excel(name = "璁惧缂栧彿", width = 15)
@ApiModelProperty("璁惧缂栧彿")
private String equipmentId;
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О",width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 15)
@ApiModelProperty("璁惧鍚嶇О")
private String equipmentName;
/**
* 鏃ユ湡
*/
- @JsonFormat(timezone = "GMT+8",pattern = "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 = "鏃ユ湡")
- private Date date;
+ private Date torqueDate;
/**
* 鎵煩鍊�
*/
- @Excel(name = "鎵煩鍊�",width = 15)
+ @Excel(name = "鎵煩鍊�", width = 15)
@ApiModelProperty("鎵煩鍊�")
private float torqueValue;
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞",width = 15)
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty("澶囨敞")
private String notes;
/**
* 鍒涘缓鏃堕棿
*/
- @JsonFormat(timezone = "GMY+8",pattern = "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 = "鍒涘缓鏃堕棿")
private Date createTime;
@@ -84,14 +84,14 @@
/**
* 鍒涘缓浜�
*/
- @Excel(name = "鍒涘缓浜�",width = 15)
+ @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty("鍒涘缓浜�")
private String createBy;
/**
* 鏇存柊鏃堕棿
*/
- @JsonFormat(timezone = "GMY+8",pattern = "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 updateTime;
@@ -99,7 +99,7 @@
/**
* 鏇存柊浜�
*/
- @Excel(name = "鏇存柊浜�",width = 15)
+ @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
--
Gitblit v1.9.3