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

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/7007.c83c5e4a.chunk.css b/ruoyi-admin/src/main/resources/static/7007.c83c5e4a.chunk.css
new file mode 100644
index 0000000..70c3bfe
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/7007.c83c5e4a.chunk.css
@@ -0,0 +1 @@
+.card___zrc4U{margin-bottom:12px}