From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/pom.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 6248a2c..07627a3 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -25,4 +25,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3