From 0c5488ba374f19b59c6a32bd4abe583ec4c73051 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 30 Jul 2025 11:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java    | 3 +++
 .../main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
index 17cd736..8df284a 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
@@ -87,5 +87,8 @@ public class SysOaWarehouseMasterVo {
      * 日志操作次数
      */
     private Integer logCount;
+    //单位
+    @ExcelProperty(value = "单位")
+    private String unit;
 
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
index 07ff957..06ed621 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
@@ -102,6 +102,7 @@
             sowd.remark,
             sow.brand,
             sow.name                    AS warehouseName,
+            sow.unit,
             COALESCE(sow.model,  sowt.model)               AS model,
             COALESCE(sow.brand,  sowt.brand)               AS brand,
             COALESCE(sow.specifications, sowt.specifications) AS specifications,