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,