解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/2873.0b5873a2.async.js b/ruoyi-admin/src/main/resources/static/2873.0b5873a2.async.js
new file mode 100644
index 0000000..b5a22a3
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/2873.0b5873a2.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[2873],{52873:function(m,u,a){a.r(u);var i=a(67294),l=a(17788),s=a(26412),t=a(76772),n=a(61314),e=a(85893),p=function(r){var d,o=r.values,g=r.businessTypeOptions,M=r.operatorTypeOptions,_=r.statusOptions,c=(0,t.useIntl)(),C=function(){},F=function(){r.onCancel()};return(0,e.jsx)(l.Z,{width:640,title:c.formatMessage({id:"monitor.operlog.title",defaultMessage:"\u7F16\u8F91\u64CD\u4F5C\u65E5\u5FD7\u8BB0\u5F55"}),open:r.open,destroyOnClose:!0,onOk:C,onCancel:F,children:(0,e.jsxs)(s.Z,{column:24,children:[(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.module",defaultMessage:"\u64CD\u4F5C\u6A21\u5757"}),children:"".concat(o.title,"/").concat((0,n.n)(g,o.businessType))}),(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.request_method",defaultMessage:"\u8BF7\u6C42\u65B9\u5F0F"}),children:o.requestMethod}),(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.oper_name",defaultMessage:"\u64CD\u4F5C\u4EBA\u5458"}),children:"".concat(o.operName,"/").concat(o.operIp)}),(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.operator_type",defaultMessage:"\u64CD\u4F5C\u7C7B\u522B"}),children:(0,n.n)(M,o.operatorType)}),(0,e.jsx)(s.Z.Item,{span:24,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.method",defaultMessage:"\u65B9\u6CD5\u540D\u79F0"}),children:o.method}),(0,e.jsx)(s.Z.Item,{span:24,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.oper_url",defaultMessage:"\u8BF7\u6C42URL"}),children:o.operUrl}),(0,e.jsx)(s.Z.Item,{span:24,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.oper_param",defaultMessage:"\u8BF7\u6C42\u53C2\u6570"}),children:o.operParam}),(0,e.jsx)(s.Z.Item,{span:24,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.json_result",defaultMessage:"\u8FD4\u56DE\u53C2\u6570"}),children:o.jsonResult}),(0,e.jsx)(s.Z.Item,{span:24,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.error_msg",defaultMessage:"\u9519\u8BEF\u6D88\u606F"}),children:o.errorMsg}),(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.status",defaultMessage:"\u64CD\u4F5C\u72B6\u6001"}),children:(0,n.n)(_,o.status)}),(0,e.jsx)(s.Z.Item,{span:12,label:(0,e.jsx)(t.FormattedMessage,{id:"monitor.operlog.oper_time",defaultMessage:"\u64CD\u4F5C\u65F6\u95F4"}),children:(d=o.operTime)===null||d===void 0?void 0:d.toString()})]})})};u.default=p},61314:function(m,u,a){a.d(u,{n:function(){return i}});function i(l,s,t){if(s!==void 0){var n=l[s];if(n)return n.text}return t||s}}}]);