From 05e5ffa3d347218cfa12e8c4a58fae78d7146ff4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 16 十月 2026 14:57:30 +0800
Subject: [PATCH] 设备导出支持按筛选条件导出 - 仪器设备一览表导出: 支持设备名称/管理编号/状态/设备分类筛选, 无筛选时导出全部 - 设备使用记录导出: 支持样品编号/管理编号筛选; 未选中具体设备时可导出全部设备记录
---
cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java b/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
index 1588fd8..e2afe93 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
@@ -14,7 +14,7 @@
@ExcelProperty("瑙勬牸鍨嬪彿*")
private String model;
- @ExcelProperty("鐢熶骇鍘傚*")
+ @ExcelProperty("鐢熶骇鍘傚")
private String factoryManufacturer;
@ExcelProperty("鍑哄巶缂栧彿*")
@@ -29,6 +29,9 @@
@ExcelProperty("鏁伴噺*")
private String quantity;
+ @ExcelProperty("鍗曚綅")
+ private String unit;
+
@ExcelProperty("璐疆鏃ユ湡*(yyyy-MM-dd)")
private String acquisitionDate;
--
Gitblit v1.9.3