解决合并冲突,并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/1581.dc72acfd.chunk.css b/ruoyi-admin/src/main/resources/static/1581.dc72acfd.chunk.css
new file mode 100644
index 0000000..cf32f7b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/1581.dc72acfd.chunk.css
@@ -0,0 +1 @@
+.card___fGN_T{margin-bottom:12px}.miniChart___Qvm3q{position:relative;width:100%}.miniChart___Qvm3q .chartContent___keQ6l{position:absolute;bottom:-28px;width:100%}.miniChart___Qvm3q .chartContent___keQ6l>div{margin:0 -5px;overflow:hidden}.miniChart___Qvm3q .chartLoading___wFM1g{position:absolute;top:16px;left:50%;margin-left:-7px}