From 43ab09b69686d72a4e3b75a23c52ab98314be25a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 26 十月 2026 13:53:52 +0800
Subject: [PATCH] feat(device): 核查计划明细设备型号独立存储不再拼接进设备名称；设备导入模板与校验文案统一设备名称命名
---
cnas-device/src/main/java/com/ruoyi/device/excel/upload/DeviceImport.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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..78c20b9 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
@@ -8,7 +8,7 @@
@ColumnWidth(22)
public class DeviceImport {
- @ExcelProperty("浠櫒鍚嶇О*")
+ @ExcelProperty("璁惧鍚嶇О*")
private String deviceName;
@ExcelProperty("瑙勬牸鍨嬪彿*")
@@ -20,16 +20,13 @@
@ExcelProperty("鏍″噯鏈夋晥鏈�*(yyyy-MM-dd)")
private String activationDate;
- @ExcelProperty("鎵�灞為儴闂�*")
- private String laboratoryName;
-
@ExcelProperty("褰撳墠鐘舵��*")
private String deviceStatus;
@ExcelProperty("鏍″噯鍛ㄦ湡(鏈�)*")
private String calibrationDate;
- @ExcelProperty("鑻辨枃鍚嶇О")
+ @ExcelProperty("璁惧EN鍚嶇О")
private String enDeviceName;
@ExcelProperty("鐢熶骇鍘傚")
--
Gitblit v1.9.3