解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/5808.daeb764c.async.js b/ruoyi-admin/src/main/resources/static/5808.daeb764c.async.js
new file mode 100644
index 0000000..0430233
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/5808.daeb764c.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[5808],{42734:function(v,s,n){n.r(s);var _=n(67294),i=n(76772),d=n(17788),E=n(92398),f=n(53951),c=n(65899),e=n(85893),o=function(t){var O=(0,i.useIntl)(),l=[],u=Object.keys(t.data);return u.forEach(function(a){l.push({key:a+"1",label:a.substring(a.lastIndexOf("/")+1,a.indexOf(".vm")),children:(0,e.jsx)(f.default,{className:"java",children:t.data[a]})})}),(0,_.useEffect)(function(){},[]),(0,e.jsx)(d.Z,{width:900,title:O.formatMessage({id:"gen.preview",defaultMessage:"\u9884\u89C8"}),open:t.open,destroyOnClose:!0,footer:!1,onOk:function(){t.onHide()},onCancel:function(){t.onHide()},children:(0,e.jsx)(E.Z,{defaultActiveKey:"1",items:l})})};s.default=o}}]);