解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/3484.4f137de3.async.js b/ruoyi-admin/src/main/resources/static/3484.4f137de3.async.js
new file mode 100644
index 0000000..701d6f8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/3484.4f137de3.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[3484],{94162:function(F,j,n){var _=n(64599),a=n.n(_),O=n(67294),t=n(66309),v=n(85893),y=function(m){function W(i){switch(i){case"primary":return"blue";case"success":return"success";case"info":return"green";case"warning":return"warning";case"danger":return"error";case"default":default:return"default"}}function U(i){if(i===void 0)return"";if(m.enums){var h=m.enums[i];return h.label}if(m.options){if(!Array.isArray(m.options))return console.log("DictTag options is no array!"),"";var u=a()(m.options),b;try{for(u.s();!(b=u.n()).done;){var C=b.value;if(C.value===i)return C.text}}catch(l){u.e(l)}finally{u.f()}}return String(m.value)}function L(i){if(i===void 0)return"default";if(m.enums){var h=m.enums[i];return h.listClass||"default"}if(m.options){if(!Array.isArray(m.options))return console.log("DictTag options is no array!"),"default";var u=a()(m.options),b;try{for(u.s();!(b=u.n()).done;){var C=b.value;if(C.value===i)return C.listClass||"default"}}catch(l){u.e(l)}finally{u.f()}}return String(m.value)}var M=function(){return W(L(m.value).toLowerCase())},A=function(){return U(m.value)};return(0,v.jsx)(t.Z,{color:M(),children:A()})};j.Z=y},33867:function(F,j,n){n.d(j,{iK:function(){return _},zc:function(){return O}});var _=function(t){return t[t.SUCCESS=200]="SUCCESS",t[t.ERROR=-1]="ERROR",t[t.TIMEOUT=401]="TIMEOUT",t.TYPE="success",t}({}),a=function(t){return t.GET="GET",t.POST="POST",t.PUT="PUT",t.DELETE="DELETE",t}({}),O=function(t){return t.JSON="application/json;charset=UTF-8",t.FORM_URLENCODED="application/x-www-form-urlencoded;charset=UTF-8",t.FORM_DATA="multipart/form-data;charset=UTF-8",t}({})},32597:function(F,j,n){n.d(j,{G6:function(){return C},HM:function(){return M},Ro:function(){return i},Xe:function(){return u},s8:function(){return D},zg:function(){return U}});var _=n(15009),a=n.n(_),O=n(99289),t=n.n(O),v=n(76772),y=n(30964);function D(l){return m.apply(this,arguments)}function m(){return m=t()(a()().mark(function l(T){return a()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return p.abrupt("return",(0,v.request)("/api/monitor/operlog/list",{method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"},params:T}));case 1:case"end":return p.stop()}},l)})),m.apply(this,arguments)}function W(l){return request("/api/monitor/operlog/".concat(l),{method:"GET"})}function U(l){return L.apply(this,arguments)}function L(){return L=t()(a()().mark(function l(T){return a()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return p.abrupt("return",(0,v.request)("/api/monitor/operlog",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:T}));case 1:case"end":return p.stop()}},l)})),L.apply(this,arguments)}function M(l){return A.apply(this,arguments)}function A(){return A=t()(a()().mark(function l(T){return a()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return p.abrupt("return",(0,v.request)("/api/monitor/operlog",{method:"PUT",headers:{"Content-Type":"application/json;charset=UTF-8"},data:T}));case 1:case"end":return p.stop()}},l)})),A.apply(this,arguments)}function i(l){return h.apply(this,arguments)}function h(){return h=t()(a()().mark(function l(T){return a()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return p.abrupt("return",(0,v.request)("/api/monitor/operlog/".concat(T),{method:"DELETE"}));case 1:case"end":return p.stop()}},l)})),h.apply(this,arguments)}function u(){return b.apply(this,arguments)}function b(){return b=t()(a()().mark(function l(){return a()().wrap(function(g){for(;;)switch(g.prev=g.next){case 0:return g.abrupt("return",(0,v.request)("/api/monitor/operlog/clean",{method:"DELETE"}));case 1:case"end":return g.stop()}},l)})),b.apply(this,arguments)}function C(l){return(0,y.su)("/api/monitor/operlog/export",{params:l},"operlog_".concat(new Date().getTime(),".xlsx"))}},92982:function(F,j,n){n.d(j,{Hr:function(){return h},QK:function(){return J},Vd:function(){return M},a7:function(){return l},jK:function(){return U},n2:function(){return Q},oH:function(){return b},pX:function(){return A},sF:function(){return g}});var _=n(15009),a=n.n(_),O=n(97857),t=n.n(O),v=n(99289),y=n.n(v),D=n(76772),m=n(33867),W=n(30964);function U(c){return L.apply(this,arguments)}function L(){return L=y()(a()().mark(function c(E){return a()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:return s.abrupt("return",(0,D.request)("/api/system/dict/type/list",{params:t()({},E),method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"}}));case 1:case"end":return s.stop()}},c)})),L.apply(this,arguments)}function M(c){return(0,D.request)("/api/system/dict/type/".concat(c),{method:"GET"})}function A(c,E){return i.apply(this,arguments)}function i(){return i=y()(a()().mark(function c(E,I){var s,$;return a()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,(0,D.request)("/api/system/dict/data/type/".concat(E),{method:"GET"});case 2:if(s=e.sent,s.code!==m.iK.SUCCESS){e.next=9;break}return $={},s.data.forEach(function(r){$[r.dictValue]={text:r.dictLabel,label:r.dictLabel,value:I?Number(r.dictValue):r.dictValue,key:r.dictCode,listClass:r.listClass,status:r.listClass}}),e.abrupt("return",$);case 9:return e.abrupt("return",{});case 10:case"end":return e.stop()}},c)})),i.apply(this,arguments)}function h(c,E){return u.apply(this,arguments)}function u(){return u=y()(a()().mark(function c(E,I){var s,$;return a()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,(0,D.request)("/api/system/dict/data/type/".concat(E),{method:"GET"});case 2:if(s=e.sent,s.code!==200){e.next=6;break}return $=s.data.map(function(r){return{text:r.dictLabel,label:r.dictLabel,value:I?Number(r.dictValue):r.dictValue,key:r.dictCode,listClass:r.listClass,status:r.listClass}}),e.abrupt("return",$);case 6:return e.abrupt("return",[]);case 7:case"end":return e.stop()}},c)})),u.apply(this,arguments)}function b(c){return C.apply(this,arguments)}function C(){return C=y()(a()().mark(function c(E){return a()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:return s.abrupt("return",(0,D.request)("/api/system/dict/type",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:E}));case 1:case"end":return s.stop()}},c)})),C.apply(this,arguments)}function l(c){return T.apply(this,arguments)}function T(){return T=y()(a()().mark(function c(E){return a()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:return s.abrupt("return",(0,D.request)("/api/system/dict/type",{method:"PUT",headers:{"Content-Type":"application/json;charset=UTF-8"},data:E}));case 1:case"end":return s.stop()}},c)})),T.apply(this,arguments)}function g(c){return p.apply(this,arguments)}function p(){return p=y()(a()().mark(function c(E){return a()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:return s.abrupt("return",(0,D.request)("/api/system/dict/type/".concat(E),{method:"DELETE"}));case 1:case"end":return s.stop()}},c)})),p.apply(this,arguments)}function Q(c){return(0,W.su)("/api/system/dict/type/export",{params:c},"dict_type_".concat(new Date().getTime(),".xlsx"))}function J(c){return G.apply(this,arguments)}function G(){return G=y()(a()().mark(function c(E){return a()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:return s.abrupt("return",(0,D.request)("/api/system/dict/type/optionselect",{params:t()({},E),method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"}}));case 1:case"end":return s.stop()}},c)})),G.apply(this,arguments)}},30964:function(F,j,n){n.d(j,{p6:function(){return U},su:function(){return L}});var _=n(15009),a=n.n(_),O=n(97857),t=n.n(O),v=n(99289),y=n.n(v),D=n(76772),m={xlsx:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",zip:"application/zip"};function W(i,h){var u=document.createElement("a"),b=new Blob([i.data],{type:h}),C=new RegExp("filename=([^;]+\\.[^\\.;]+);*"),l=decodeURI(i.headers["content-disposition"]),T=C.exec(l),g=T?T[1]:"file";g=g.replace(/"/g,""),u.style.display="none",u.href=URL.createObjectURL(b),u.setAttribute("download",g),document.body.appendChild(u),u.click(),URL.revokeObjectURL(u.href),document.body.removeChild(u)}function U(i){(0,D.request)(i,{method:"GET",responseType:"blob",getResponse:!0}).then(function(h){W(h,m.zip)})}function L(i,h,u){return M.apply(this,arguments)}function M(){return M=y()(a()().mark(function i(h,u,b){return a()().wrap(function(l){for(;;)switch(l.prev=l.next){case 0:return l.abrupt("return",(0,D.request)(h,t()(t()({},u),{},{method:"POST",responseType:"blob"})).then(function(T){var g=document.createElement("a"),p=T;g.style.display="none",g.href=URL.createObjectURL(p),g.setAttribute("download",b),document.body.appendChild(g),g.click(),URL.revokeObjectURL(g.href),document.body.removeChild(g)}));case 1:case"end":return l.stop()}},i)})),M.apply(this,arguments)}function A(i){window.location.href="/api/common/download?fileName=".concat(encodeURI(i),"&delete=",!0)}},61314:function(F,j,n){n.d(j,{n:function(){return _}});function _(a,O,t){if(O!==void 0){var v=a[O];if(v)return v.text}return t||O}},66309:function(F,j,n){n.d(j,{Z:function(){return Y}});var _=n(67294),a=n(93967),O=n.n(a),t=n(98423),v=n(98787),y=n(69760),D=n(96159),m=n(45353),W=n(53124),U=n(11568),L=n(15063),M=n(14747),A=n(83262),i=n(83559);const h=e=>{const{paddingXXS:r,lineWidth:f,tagPaddingHorizontal:o,componentCls:d,calc:R}=e,P=R(o).sub(f).equal(),K=R(r).sub(f).equal();return{[d]:Object.assign(Object.assign({},(0,M.Wf)(e)),{display:"inline-block",height:"auto",marginInlineEnd:e.marginXS,paddingInline:P,fontSize:e.tagFontSize,lineHeight:e.tagLineHeight,whiteSpace:"nowrap",background:e.defaultBg,border:`${(0,U.bf)(e.lineWidth)} ${e.lineType} ${e.colorBorder}`,borderRadius:e.borderRadiusSM,opacity:1,transition:`all ${e.motionDurationMid}`,textAlign:"start",position:"relative",[`&${d}-rtl`]:{direction:"rtl"},"&, a, a:hover":{color:e.defaultColor},[`${d}-close-icon`]:{marginInlineStart:K,fontSize:e.tagIconSize,color:e.colorTextDescription,cursor:"pointer",transition:`all ${e.motionDurationMid}`,"&:hover":{color:e.colorTextHeading}},[`&${d}-has-color`]:{borderColor:"transparent",[`&, a, a:hover, ${e.iconCls}-close, ${e.iconCls}-close:hover`]:{color:e.colorTextLightSolid}},"&-checkable":{backgroundColor:"transparent",borderColor:"transparent",cursor:"pointer",[`&:not(${d}-checkable-checked):hover`]:{color:e.colorPrimary,backgroundColor:e.colorFillSecondary},"&:active, &-checked":{color:e.colorTextLightSolid},"&-checked":{backgroundColor:e.colorPrimary,"&:hover":{backgroundColor:e.colorPrimaryHover}},"&:active":{backgroundColor:e.colorPrimaryActive}},"&-hidden":{display:"none"},[`> ${e.iconCls} + span, > span + ${e.iconCls}`]:{marginInlineStart:P}}),[`${d}-borderless`]:{borderColor:"transparent",background:e.tagBorderlessBg}}},u=e=>{const{lineWidth:r,fontSizeIcon:f,calc:o}=e,d=e.fontSizeSM;return(0,A.IX)(e,{tagFontSize:d,tagLineHeight:(0,U.bf)(o(e.lineHeightSM).mul(d).equal()),tagIconSize:o(f).sub(o(r).mul(2)).equal(),tagPaddingHorizontal:8,tagBorderlessBg:e.defaultBg})},b=e=>({defaultBg:new L.t(e.colorFillQuaternary).onBackground(e.colorBgContainer).toHexString(),defaultColor:e.colorText});var C=(0,i.I$)("Tag",e=>{const r=u(e);return h(r)},b),l=function(e,r){var f={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&r.indexOf(o)<0&&(f[o]=e[o]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var d=0,o=Object.getOwnPropertySymbols(e);d<o.length;d++)r.indexOf(o[d])<0&&Object.prototype.propertyIsEnumerable.call(e,o[d])&&(f[o[d]]=e[o[d]]);return f},g=_.forwardRef((e,r)=>{const{prefixCls:f,style:o,className:d,checked:R,onChange:P,onClick:K}=e,B=l(e,["prefixCls","style","className","checked","onChange","onClick"]),{getPrefixCls:V,tag:x}=_.useContext(W.E_),X=Z=>{P==null||P(!R),K==null||K(Z)},H=V("tag",f),[k,q,w]=C(H),ee=O()(H,`${H}-checkable`,{[`${H}-checkable-checked`]:R},x==null?void 0:x.className,d,q,w);return k(_.createElement("span",Object.assign({},B,{ref:r,style:Object.assign(Object.assign({},o),x==null?void 0:x.style),className:ee,onClick:X})))}),p=n(98719);const Q=e=>(0,p.Z)(e,(r,f)=>{let{textColor:o,lightBorderColor:d,lightColor:R,darkColor:P}=f;return{[`${e.componentCls}${e.componentCls}-${r}`]:{color:o,background:R,borderColor:d,"&-inverse":{color:e.colorTextLightSolid,background:P,borderColor:P},[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}});var J=(0,i.bk)(["Tag","preset"],e=>{const r=u(e);return Q(r)},b);function G(e){return typeof e!="string"?e:e.charAt(0).toUpperCase()+e.slice(1)}const c=(e,r,f)=>{const o=G(f);return{[`${e.componentCls}${e.componentCls}-${r}`]:{color:e[`color${f}`],background:e[`color${o}Bg`],borderColor:e[`color${o}Border`],[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}};var E=(0,i.bk)(["Tag","status"],e=>{const r=u(e);return[c(r,"success","Success"),c(r,"processing","Info"),c(r,"error","Error"),c(r,"warning","Warning")]},b),I=function(e,r){var f={};for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&r.indexOf(o)<0&&(f[o]=e[o]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var d=0,o=Object.getOwnPropertySymbols(e);d<o.length;d++)r.indexOf(o[d])<0&&Object.prototype.propertyIsEnumerable.call(e,o[d])&&(f[o[d]]=e[o[d]]);return f};const $=_.forwardRef((e,r)=>{const{prefixCls:f,className:o,rootClassName:d,style:R,children:P,icon:K,color:B,onClose:V,bordered:x=!0,visible:X}=e,H=I(e,["prefixCls","className","rootClassName","style","children","icon","color","onClose","bordered","visible"]),{getPrefixCls:k,direction:q,tag:w}=_.useContext(W.E_),[ee,Z]=_.useState(!0),ue=(0,t.Z)(H,["closeIcon","closable"]);_.useEffect(()=>{X!==void 0&&Z(X)},[X]);const te=(0,v.o2)(B),ae=(0,v.yT)(B),ne=te||ae,ce=Object.assign(Object.assign({backgroundColor:B&&!ne?B:void 0},w==null?void 0:w.style),R),S=k("tag",f),[de,_e,pe]=C(S),me=O()(S,w==null?void 0:w.className,{[`${S}-${B}`]:ne,[`${S}-has-color`]:B&&!ne,[`${S}-hidden`]:!ee,[`${S}-rtl`]:q==="rtl",[`${S}-borderless`]:!x},o,d,_e,pe),oe=z=>{z.stopPropagation(),V==null||V(z),!z.defaultPrevented&&Z(!1)},[,ge]=(0,y.Z)((0,y.w)(e),(0,y.w)(w),{closable:!1,closeIconRender:z=>{const he=_.createElement("span",{className:`${S}-close-icon`,onClick:oe},z);return(0,D.wm)(z,he,N=>({onClick:ie=>{var re;(re=N==null?void 0:N.onClick)===null||re===void 0||re.call(N,ie),oe(ie)},className:O()(N==null?void 0:N.className,`${S}-close-icon`)}))}}),fe=typeof H.onClick=="function"||P&&P.type==="a",se=K||null,be=se?_.createElement(_.Fragment,null,se,P&&_.createElement("span",null,P)):P,le=_.createElement("span",Object.assign({},ue,{ref:r,className:me,style:ce}),be,ge,te&&_.createElement(J,{key:"preset",prefixCls:S}),ae&&_.createElement(E,{key:"status",prefixCls:S}));return de(fe?_.createElement(m.Z,{component:"Tag"},le):le)});$.CheckableTag=g;var Y=$}}]);