From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突

---
 jeecg-module-dry/jeecg-module-dry-start/src/main/test/com/lanbao/AiTest.java |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-start/src/main/test/java/com/lanbao/AiTest.java b/jeecg-module-dry/jeecg-module-dry-start/src/main/test/com/lanbao/AiTest.java
similarity index 100%
rename from jeecg-module-dry/jeecg-module-dry-start/src/main/test/java/com/lanbao/AiTest.java
rename to jeecg-module-dry/jeecg-module-dry-start/src/main/test/com/lanbao/AiTest.java

--
Gitblit v1.9.3