From d85cb9da90d1dd24f6ecfa187aa8c4198394c29a Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 26 二月 2025 15:41:05 +0800
Subject: [PATCH] 开发维修工单
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
index 86f6a85..be56412 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
@@ -2,6 +2,7 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.eims.domain.EimsFixture;
@@ -27,7 +28,7 @@
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = EimsFixture.class)
-public class EimsFixtureVo implements Serializable {
+public class EimsFixtureVo extends BaseEntity implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@@ -85,8 +86,16 @@
private Long borrowUser;
/**
+ * 鍊熺敤鐘舵��
+ */
+ @ExcelProperty(value = "鍊熺敤鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "fixture_borrow_status")
+ private String borrowStatus;
+
+ /**
* 鍊熺敤浜�
*/
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "borrowUser")
private String borrowUserName;
/**
@@ -146,5 +155,10 @@
@ExcelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 褰撳墠鍊熺敤璁板綍id
+ */
+ private Long curBorrowId;
+
}
--
Gitblit v1.9.3