From eb07dec15baddab47a4b879a7b1841285b835a49 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 14 三月 2025 13:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dz' into dev_dz

---
 ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java
index 1880e93..48a07e0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java
@@ -17,10 +17,10 @@
 	 */
 	private String oaHost;
 
-//	/**
-//	 * 鏂囦欢鏌ョ湅ip鍦板潃
-//	 */
-//	private String prodIp;
+	/**
+	 * 鏂囦欢鏌ョ湅ip鍦板潃
+	 */
+	private String prodIp;
 
 	/**
 	 * 瑁呭鐢电紗锛氫笉鍚堟牸瀹℃壒oa鐨刬d

--
Gitblit v1.9.3