From f9a12ecb4ea4b7b103b50634335704140237fef7 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local>
Date: 星期三, 19 二月 2025 15:11:28 +0800
Subject: [PATCH] 完成工具借用、归还相关

---
 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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..7ca4dae 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
@@ -85,8 +85,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 +154,10 @@
     @ExcelProperty(value = "澶囨敞")
     private String remark;
 
+    /**
+     * 褰撳墠鍊熺敤璁板綍id
+     */
+    private Long curBorrowId;
+
 
 }

--
Gitblit v1.9.3