From c3a23c85cc27771fcce57569c8742ab2772f7da2 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/domain/receiver/BoxInfoReceiver.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/domain/receiver/BoxInfoReceiver.java b/ard-work/src/main/java/com/ard/work/domain/receiver/BoxInfoReceiver.java
index 80c880b..c57218e 100644
--- a/ard-work/src/main/java/com/ard/work/domain/receiver/BoxInfoReceiver.java
+++ b/ard-work/src/main/java/com/ard/work/domain/receiver/BoxInfoReceiver.java
@@ -61,7 +61,7 @@
     /**
      * 服务器实体对象ID
      */
-    private String serverInfoId;
+    private String serverId;
 
     /**
      * 服务器实体对象

--
Gitblit v1.9.3