From 19ff36d04078c4a845e5f7255e513c8ae9d60c7a Mon Sep 17 00:00:00 2001
From: jlzhou <12020042@qq.com>
Date: Mon, 14 Apr 2025 11:05:16 +0800
Subject: [PATCH] fix .

---
 .../src/main/java/com/ruoyi/demo/controller/DynConfigApi.java | 2 +-
 script/docker/docker-compose.yml                              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/DynConfigApi.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/DynConfigApi.java
index 7a9f007..6797273 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/DynConfigApi.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/DynConfigApi.java
@@ -23,7 +23,7 @@ public class DynConfigApi {
   public Object get(){
 //    return config; //java中可以直接使用，但是不能JSON序列号，因为他是经过aop代理后的bean
 //    return BeanUtil.toBean(config, TestDynConfig.class);
-    return DynConfigUtils.toBean(config);
+    return DynConfigUtils.toBean(config,TestDynConfig.class);
   }
 
 
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index cbfa310..e68bccf 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -3,6 +3,10 @@ networks:
   base2024-network:
     name: base2024-network
     driver: bridge
+    ipam:
+      config:
+        - subnet: 192.168.222.0/24
+          gateway: 192.168.222.1
 
 services: