From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
index acbcdc1..8fb893a 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -12,9 +12,5 @@
      */
     @Excel(name = "鏂囨。鍚嶇О")
     private String docName;
-    /**
-     * 鍊熼槄浜�
-     */
-    @Excel(name = "鍊熼槄浜�")
-    private String nickName;
+
 }

--
Gitblit v1.9.3