From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误

---
 ruoyi-ui/src/assets/logo/logo.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png
new file mode 100644
index 0000000..e263760
--- /dev/null
+++ b/ruoyi-ui/src/assets/logo/logo.png
Binary files differ

--
Gitblit v1.9.3