From 7787f57521297df847bfd5f2b9af410b3fdac67e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java b/cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java
index 86904df..582005e 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java
@@ -20,9 +20,6 @@
@ExcelProperty("鏍″噯鏈夋晥鏈�*(yyyy-MM-dd)")
private String activationDate;
- @ExcelProperty("鎵�灞為儴闂�*")
- private String laboratoryName;
-
@ExcelProperty("褰撳墠鐘舵��*")
private String deviceStatus;
--
Gitblit v1.9.3