From be8a6f171bd41aa50fb7310b2ccbe753dac20b89 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 616077c..4435ed5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -263,6 +263,7 @@
private String fireExtinguisherValidityPeriod;
@Excel(name = "鎿嶄綔绯荤粺", width = 15,orderNum = "13")
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ @Dict(dicCode = "operation_flag")
private String operatingSystem;
@Excel(name = "绯荤粺", width = 15,orderNum = "14")
@ApiModelProperty(value = "绯荤粺")
@@ -408,10 +409,12 @@
/**宸ユ*/
@Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String areaId;
+
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
+
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -423,6 +426,8 @@
private String yseNoMaintenance2Standard;
@TableField(exist = false)
private String yseNoMaintenance3Standard;
+ @TableField(exist = false)
+ private List<String> userWorkCenterIds;
}
--
Gitblit v1.9.3