From b6ef58a8130f5336bc8a27a143f0ece16b919a2a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 四月 2025 11:42:21 +0800
Subject: [PATCH] art: 设备管理-设备履历-字段转译

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
index 917b058..6008547 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
@@ -3,12 +3,15 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -35,6 +38,8 @@
 	private java.lang.String createBy;
 	/**鍒涘缓鏃堕棿*/
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 	/**璁惧ID*/
 	@Excel(name = "璁惧ID", width = 15)
@@ -43,10 +48,12 @@
 	/**鎿嶄綔鏍囩*/
 	@Excel(name = "鎿嶄綔鏍囩", width = 15)
     @ApiModelProperty(value = "鎿嶄綔鏍囩")
+	@Dict(dicCode = "equipment_operation_tag")
 	private java.lang.String operationTag;
 	/**鎿嶄綔浜�*/
 	@Excel(name = "鎿嶄綔浜�", width = 15)
     @ApiModelProperty(value = "鎿嶄綔浜�")
+	@Dict(dicCode = "sys_user, realname, username")
 	private java.lang.String operator;
 	/**鎿嶄綔鎻忚堪*/
 	@Excel(name = "鎿嶄綔鎻忚堪", width = 15)

--
Gitblit v1.9.3