From 7768b430fc3d9d22ae22ec987a34a4532a53f591 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 30 六月 2025 11:10:19 +0800
Subject: [PATCH] Resolve merger conflicts

---
 ruoyi-ui/src/assets/images/login-background.jpg |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/ruoyi-ui/src/assets/images/login-background.jpg
new file mode 100644
index 0000000..8a89eb8
--- /dev/null
+++ b/ruoyi-ui/src/assets/images/login-background.jpg
Binary files differ

--
Gitblit v1.9.1