解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/2157.3281fc9c.chunk.css b/ruoyi-admin/src/main/resources/static/2157.3281fc9c.chunk.css
new file mode 100644
index 0000000..e3aa5ce
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/2157.3281fc9c.chunk.css
@@ -0,0 +1 @@
+.Sw1SiR3p0kPg9gBTKiS9{width:100%;height:100%}.fLKNaz433i4SrRGdF_sK{height:100%;display:flex;flex-direction:column;border-radius:12px;overflow:hidden;box-shadow:0 2px 8px #0000001a;transition:all .3s ease;background:#fff}.fLKNaz433i4SrRGdF_sK:hover{transform:translateY(-4px);box-shadow:0 8px 24px #00000026}.G8o14dsLroIuf9dNZv76{width:100%;height:200px;overflow:hidden;position:relative;background:#f5f5f5;display:flex;align-items:center;justify-content:center}.sncxezo_46iaLcd8rB8v{width:100%;height:100%;object-fit:contain;object-position:center;transition:transform .3s ease;background:#f5f5f5}.fLKNaz433i4SrRGdF_sK:hover .sncxezo_46iaLcd8rB8v{transform:scale(1.02)}.nrfDyBKHs5AM2ngpu6JF{position:absolute;top:8px;right:8px;background:linear-gradient(45deg,#ff6b6b,orange);color:#fff;padding:4px 8px;border-radius:12px;font-size:11px;font-weight:700;display:flex;align-items:center;gap:4px;z-index:10;box-shadow:0 2px 4px #0003}.xoKs_d57Yk_i5KP2eG0F{flex:1 1;display:flex;flex-direction:column;height:100%}.kJNUt7hPVt0ydSWCsNEA{font-size:16px;font-weight:600;margin:0 0 12px;line-height:1.4;color:#262626;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;height:44px}.oAvcHaezPl8oy19KmV1E{display:flex;align-items:center;font-size:12px;color:#8c8c8c;margin-bottom:12px;height:20px}.AVhSmqW1R9wnUYS77Jju{font-weight:500;color:#595959}.LrPqhQoCnwxRqOFZF7Ec{color:#8c8c8c}.CkoiqytoVnYWGzCpWIlQ{margin-bottom:12px;height:24px;display:flex;flex-wrap:wrap;gap:4px;overflow:hidden}.IP8Kd6IrokvRcPsgsxG_{font-size:11px;padding:2px 6px;margin:0;border-radius:4px}.J1Qc5EXwYoSIH6i8VMnY{flex:1 1;font-size:13px;color:#595959;line-height:1.5;margin-bottom:16px;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden;height:60px}.XVcurRkPtQ0poEF5oVxw{display:flex;align-items:center;justify-content:space-between;margin-top:auto;padding-top:12px;border-top:1px solid #f0f0f0;height:32px}.pQyr9uxoG4IOhPDZdymz{display:flex;gap:16px}.GZj0J6DqgIgj8HOSSrIF{display:flex;align-items:center;gap:4px;font-size:12px;color:#8c8c8c}.GZj0J6DqgIgj8HOSSrIF ._ZK1PAOEgoPr6I7O3BHO{font-size:12px}.Byv5WJQiZRMmCqMmmqQz{padding:0;font-size:12px;color:#1890ff;font-weight:500}.Byv5WJQiZRMmCqMmmqQz:hover{color:#40a9ff}@media (max-width: 768px){.G8o14dsLroIuf9dNZv76{height:160px}.kJNUt7hPVt0ydSWCsNEA{font-size:14px;height:40px}.J1Qc5EXwYoSIH6i8VMnY{font-size:12px;-webkit-line-clamp:2;height:36px}.pQyr9uxoG4IOhPDZdymz{gap:12px}.GZj0J6DqgIgj8HOSSrIF{font-size:11px}}