From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcel.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcel.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcel.java
index e085a04..8e1d94d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcel.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcel.java
@@ -16,7 +16,9 @@
@ColumnWidth(20)
@ExcelProperty("鏈哄簥缂栧彿")
private String code;
-
+ @ColumnWidth(20)
+ @ExcelProperty("璁惧缂栧彿")
+ private String equipmentCode;
@ExcelProperty("鏈哄簥鍨嬪彿")
private String name;
@ExcelIgnore
@@ -51,17 +53,19 @@
private String controlSystemName;
@Schema(description = "绋嬪簭涓存椂鐩綍")
+ @ExcelProperty("绋嬪簭涓存椂鐩綍")
private String progTempDir;
@ExcelProperty("绋嬪簭涓嬪彂鐩綍")
private String progSendDir;
- @Schema(description = "SND鏂囦欢澶逛繚鎸佹椂闂�(灏忔椂)")
+ @ExcelProperty("涓嬪彂鐩綍淇濇寔鏃堕棿")
private Integer sendDirExpiryHours;
@ExcelProperty("绋嬪簭鍥炰紶鐩綍")
private String progReceiveDir;
- @Schema(description = "RECEIVE鏂囦欢澶逛繚鎸佹椂闂�(灏忔椂)")
+
+ @ExcelProperty("鍥炰紶鐩綍淇濇寔鏃堕棿")
private Integer receiveDirExpiryHours;
@ExcelProperty("澶囨敞")
--
Gitblit v1.9.3