From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 91ad5fd..187628a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecg.common.system.base.entity.SysUpload;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -74,6 +76,8 @@
* 鏁呴殰鏃堕棿
*/
@ApiModelProperty(value = "鏁呴殰鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date faultTime;
/**
* 鏄惁鍋滄満
@@ -173,4 +177,7 @@
*/
@TableField(exist = false)
private List<SysUpload> sysUploadList;
+
+ @TableField(exist = false)
+ private String teamId;
}
--
Gitblit v1.9.3