From 504930c323050e2a32d795392147e97edf7f2f03 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 31 三月 2026 13:50:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConveyorProperties.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConveyorProperties.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConveyorProperties.java
index bcdaba6..ff377ba 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConveyorProperties.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConveyorProperties.java
@@ -30,6 +30,8 @@
 
     private Integer port;
 
+    private String url;
+
     // millisecond
     private Integer timeout = 15 * 1000;
 

--
Gitblit v1.9.1