From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 11:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index 111fc78..37502c6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -26,7 +26,7 @@
 @Accessors(chain = true)
 @ApiModel(value="eam_maintenance_standard瀵硅薄", description="淇濆吇鏍囧噯")
 public class EamMaintenanceStandard implements Serializable {
-    
+
 	/**涓婚敭*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
@@ -81,4 +81,14 @@
 	/**鍙傝�冩枃浠�*/
 	@ApiModelProperty(value = "鍙傝�冩枃浠�")
 	private String referenceFile;
+	/**
+	 * 鏈�鏂扮敓鎴愬伐鍗曟椂闂�
+	 * 涓嬩竴娆$敓鎴愭椂闂翠负姝ゆ椂闂� + 淇濆吇鍛ㄦ湡
+	 */
+	@ApiModelProperty(value = "鏈�鏂扮敓鎴愬伐鍗曟椂闂�")
+	private Date lastGenerateTime;
+
+	/**璁惧缂栧彿*/
+	private transient String equipmentText;
+
 }

--
Gitblit v1.9.3