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/MachineVO.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
index 4e659b0..a08d7b4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
@@ -12,6 +12,8 @@
 	private String code;
 	@Schema(description = "鏈哄簥鍨嬪彿")
 	private String name;
+	@Schema(description = "璁惧缂栧彿")
+	private String equipmentCode;
 	/**
 	 * 鎵�灞炴満搴婄粍code
 	 */
@@ -31,7 +33,8 @@
 
 	@Schema(description = "鎵�灞炲崟浣�/缁勭粐")
 	private Long ownerDept;
-
+	@Schema(description = "鎵�灞炲崟浣嶅悕绉�")
+	private String ownerDeptName;
 	@Schema(description = "鐢熶骇鍟�")
 	private String manufacturer;
 	/**
@@ -45,6 +48,8 @@
 	@Schema(description = "鎺у埗绯荤粺锛屽湪涓氬姟瀛楀吀閰嶇疆(key=machine_control_system)")
 	private String controlSystem;
 
+	@Schema(description = "鎺у埗绯荤粺鍚嶇О")
+	private String controlSystemName;
 	@Schema(description = "绋嬪簭涓嬪彂鐩綍")
 	private String progSendDir;
 
@@ -54,4 +59,11 @@
 	private String progTempDir;
 	@Schema(description = "澶囨敞")
 	private String remark;
+
+	@Schema(description = "send鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂")
+	private Integer sendDirExpiryHours;
+
+
+	@Schema(description = "receive鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂")
+	private Integer receiveDirExpiryHours;
 }

--
Gitblit v1.9.3