解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/6390.49643885.async.js b/ruoyi-admin/src/main/resources/static/6390.49643885.async.js
new file mode 100644
index 0000000..1396b68
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/6390.49643885.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[6390],{96390:function(o,n,t){t.r(n),t.d(n,{default:function(){return E}});var O=t(67294),u=t(76772),s=t(85893);function E(){var e=(0,u.useOutletContext)();return(0,s.jsx)(u.Outlet,{context:e})}}}]);