解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/p__404.099f02b8.async.js b/ruoyi-admin/src/main/resources/static/p__404.099f02b8.async.js
new file mode 100644
index 0000000..f9ced88
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/p__404.099f02b8.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[2571],{9826:function(E,n,t){t.r(n);var a=t(76772),o=t(59720),_=t(83622),P=t(67294),s=t(85893),u=function(){return(0,s.jsx)(o.ZP,{status:"404",title:"404",subTitle:"Sorry, the page you visited does not exist.",extra:(0,s.jsx)(_.ZP,{type:"primary",onClick:function(){return a.history.push("/")},children:"Back Home"})})};n.default=u}}]);