From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
index 40293d6..7839048 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.request;
import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
@Data
public class EamEquipmentQuery {
@@ -13,7 +15,8 @@
private String operationSystem;
private String orgId;
private String equipmentCategory;
-
+ private String factoryOrgCode;
+ private String repairDepartOrgCode;
private String column;
private String order;
}
--
Gitblit v1.9.3