解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/4994.36db0b99.chunk.css b/ruoyi-admin/src/main/resources/static/4994.36db0b99.chunk.css
new file mode 100644
index 0000000..cdcae1c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/4994.36db0b99.chunk.css
@@ -0,0 +1 @@
+.vsObFmMcbz4DMY1joptj{min-height:100vh;background-color:#f5f5f5}.KPe5M2COcv86lBJxgePY{background:#fff;box-shadow:0 2px 8px #0000001a;padding:0 24px;display:flex;align-items:center;justify-content:space-between;height:64px;position:sticky;top:0;z-index:100}.pNyUEaZLQZwQkjVVfOcD{display:flex;align-items:center;gap:8px}.eOqEZjm2jtIGvLSYDPFz{border:none;box-shadow:none;font-weight:500;padding:8px 16px;border-radius:6px;transition:all .3s ease}.eOqEZjm2jtIGvLSYDPFz:hover{background-color:#f0f0f0}.w52fDYSAMYXSzv5RanwP{flex:1 1;display:flex;justify-content:center;max-width:400px;margin:0 24px}.KhZNdFwrl2wsUAUwEW74{display:flex;align-items:center;gap:12px}.HH1zqcnfhFI23sw2CjJ6{margin:24px;border-radius:12px;overflow:hidden;box-shadow:0 4px 12px #0000001a}.s5eMAidADQArE2xc6u4h{position:relative;display:flex!important;align-items:center;justify-content:center;min-height:300px}.h4VDaQeb5kkiobKz8rJj{position:absolute;bottom:0;left:0;right:0;background:linear-gradient(transparent,#000c);color:#fff;padding:40px 40px 24px;text-align:left}.roxAV5kCWaR53RV40Ebd{font-size:28px;font-weight:700;margin:0 0 12px;text-shadow:2px 2px 4px rgba(0,0,0,.5)}.rLlCIThhMRc62YznZqfa{font-size:16px;margin:0 0 16px;opacity:.9;line-height:1.5}.nCFHDPotQWkZJY17uKz2{display:flex;gap:24px;font-size:14px;opacity:.8}.Tw0oiOJ4CzoRdgDmkWv8{padding:24px}.laRxSB61IU0hB_IzeKVB{margin-bottom:24px;text-align:center}.laRxSB61IU0hB_IzeKVB h2{font-size:24px;margin:0 0 8px;color:#1890ff}.laRxSB61IU0hB_IzeKVB p{margin:0;color:#666;font-size:14px}.SxapmqPk_2EZM14GhpOx{margin-bottom:32px}.V2vuosQXBf4YPwLL0AXs{display:flex;height:480px}.V2vuosQXBf4YPwLL0AXs>*{width:100%}.iovSwnjDrxc2CNBFMd_q{text-align:center;padding:60px 0;color:#999;font-size:16px}.iJmlTubwiMYyUigutatq{display:flex;justify-content:center;margin-top:32px}@media (max-width: 768px){.KPe5M2COcv86lBJxgePY{flex-direction:column;height:auto;padding:12px;gap:12px}.pNyUEaZLQZwQkjVVfOcD{flex-wrap:wrap;justify-content:center}.w52fDYSAMYXSzv5RanwP{margin:0;max-width:100%}.HH1zqcnfhFI23sw2CjJ6{margin:12px}.h4VDaQeb5kkiobKz8rJj{padding:20px}.roxAV5kCWaR53RV40Ebd{font-size:20px}.rLlCIThhMRc62YznZqfa{font-size:14px}.nCFHDPotQWkZJY17uKz2{flex-direction:column;gap:8px}.Tw0oiOJ4CzoRdgDmkWv8{padding:12px}}