From 5c1a8a48f73591002189a99db030440208f056b5 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 17 六月 2024 20:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index d6d1963..c8b7ece 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -88,4 +88,14 @@
     @ExcelProperty("澶囨敞")
     @ColumnWidth(250)
     private String remarks;
+
+    @Schema(title = "鎺у埗鍣↖D")
+    @ExcelProperty("鎺у埗鍣↖D")
+    @ColumnWidth(15)
+    private String controllerId;
+
+    @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+    @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+    @ColumnWidth(15)
+    private String rtuAddr;
 }

--
Gitblit v1.8.0