From 50ecf03ea7c6185123e36d02a106b447d48a3509 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 23 五月 2025 14:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
index 2b257af..5c78c33 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
@@ -1,14 +1,18 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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;
import java.util.Date;
@@ -58,12 +62,17 @@
/**鐢宠浜�*/
@Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String reportUser;
/**灏佸瓨寮�濮嬫椂闂�*/
@ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealStartTime;
/**灏佸瓨缁撴潫鏃堕棿*/
@ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealEndTime;
/**灏佸瓨鍘熷洜*/
@Excel(name = "灏佸瓨鍘熷洜", width = 15)
@@ -72,6 +81,7 @@
/**灏佸瓨鐘舵��*/
@Excel(name = "灏佸瓨鐘舵��", width = 15)
@ApiModelProperty(value = "灏佸瓨鐘舵��")
+ @Dict(dicCode = "equipment_seal_up_status")
private String sealStatus;
/**瀹℃牳浜�*/
@Excel(name = "瀹℃牳浜�", width = 15)
@@ -79,9 +89,18 @@
private String approvalUser;
/**瀹℃牳鏃堕棿*/
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date approvalTime;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+
}
--
Gitblit v1.9.3