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

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/4229.20871ee9.chunk.css b/ruoyi-admin/src/main/resources/static/4229.20871ee9.chunk.css
new file mode 100644
index 0000000..7b3684a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/4229.20871ee9.chunk.css
@@ -0,0 +1 @@
+.card{margin-bottom:12px}.miniChart{position:relative;width:100%}.miniChart .chartContent{position:absolute;bottom:-28px;width:100%}.miniChart .chartContent>div{margin:0 -5px;overflow:hidden}.miniChart .chartLoading{position:absolute;top:16px;left:50%;margin-left:-7px}