解决合并冲突,并实现种子junit单元测试

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/uploads/test.jpg b/ruoyi-admin/uploads/test.jpg
new file mode 100644
index 0000000..08cf610
--- /dev/null
+++ b/ruoyi-admin/uploads/test.jpg
@@ -0,0 +1 @@
+test content
\ No newline at end of file