From 57945f688fd21076e36ab5332028c8b4a6dcf59c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 04 九月 2025 16:37:31 +0800
Subject: [PATCH] 同步密网设备管理代码
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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..814d3ad 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;
@@ -28,36 +31,40 @@
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
+ private String id;
/**鍒涘缓浜�*/
@Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
+ private 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)
@ApiModelProperty(value = "璁惧ID")
- private java.lang.String equipmentId;
+ private String equipmentId;
/**鎿嶄綔鏍囩*/
@Excel(name = "鎿嶄綔鏍囩", width = 15)
@ApiModelProperty(value = "鎿嶄綔鏍囩")
- private java.lang.String operationTag;
+ @Dict(dicCode = "equipment_operation_tag")
+ private String operationTag;
/**鎿嶄綔浜�*/
@Excel(name = "鎿嶄綔浜�", width = 15)
@ApiModelProperty(value = "鎿嶄綔浜�")
- private java.lang.String operator;
+ @Dict(dicCode = "sys_user, realname, username")
+ private String operator;
/**鎿嶄綔鎻忚堪*/
@Excel(name = "鎿嶄綔鎻忚堪", width = 15)
@ApiModelProperty(value = "鎿嶄綔鎻忚堪")
- private java.lang.String description;
+ private String description;
/**涓氬姟涓昏〃*/
@Excel(name = "涓氬姟涓昏〃", width = 15)
@ApiModelProperty(value = "涓氬姟涓昏〃")
- private java.lang.String businessTable;
+ private String businessTable;
/**涓氬姟id*/
@Excel(name = "涓氬姟id", width = 15)
@ApiModelProperty(value = "涓氬姟id")
- private java.lang.String businessId;
+ private String businessId;
}
--
Gitblit v1.9.3