解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/2586.f4483011.async.js b/ruoyi-admin/src/main/resources/static/2586.f4483011.async.js
new file mode 100644
index 0000000..0574e50
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/2586.f4483011.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[2586],{78290:function(he,D,t){var d=t(67294),C=t(4340);const s=y=>{let N;return typeof y=="object"&&(y!=null&&y.clearIcon)?N=y:y&&(N={clearIcon:d.createElement(C.Z,null)}),N};D.Z=s},82586:function(he,D,t){t.d(D,{Z:function(){return n}});var d=t(67294),C=t(93967),s=t.n(C),y=t(67656),N=t(42550),a=t(89942),e=t(78290),u=t(9708),o=t(53124),i=t(98866),ie=t(35792),z=t(98675),ce=t(65223),Ce=t(27833),Oe=t(4173),Pe=t(72922),Ne=t(47673);function Ae(m){return!!(m.prefix||m.suffix||m.allowClear||m.showCount)}var Ie=function(m,T){var O={};for(var g in m)Object.prototype.hasOwnProperty.call(m,g)&&T.indexOf(g)<0&&(O[g]=m[g]);if(m!=null&&typeof Object.getOwnPropertySymbols=="function")for(var R=0,g=Object.getOwnPropertySymbols(m);R<g.length;R++)T.indexOf(g[R])<0&&Object.prototype.propertyIsEnumerable.call(m,g[R])&&(O[g[R]]=m[g[R]]);return O},n=(0,d.forwardRef)((m,T)=>{const{prefixCls:O,bordered:g=!0,status:R,size:W,disabled:S,onBlur:U,onFocus:F,suffix:P,allowClear:M,addonAfter:de,addonBefore:fe,className:G,style:Q,styles:ye,rootClassName:X,onChange:Z,classNames:$,variant:ne}=m,j=Ie(m,["prefixCls","bordered","status","size","disabled","onBlur","onFocus","suffix","allowClear","addonAfter","addonBefore","className","style","styles","rootClassName","onChange","classNames","variant"]),{getPrefixCls:x,direction:r,allowClear:H,autoComplete:b,className:E,style:Y,classNames:te,styles:ae}=(0,o.dj)("input"),c=x("input",O),A=(0,d.useRef)(null),v=(0,ie.Z)(c),[oe,L,ve]=(0,Ne.TI)(c,X),[I]=(0,Ne.ZP)(c,v),{compactSize:k,compactItemClassnames:re}=(0,Oe.ri)(c,r),w=(0,z.Z)(J=>{var Se;return(Se=W!=null?W:k)!==null&&Se!==void 0?Se:J}),le=d.useContext(i.Z),me=S!=null?S:le,{status:K,hasFeedback:q,feedbackIcon:p}=(0,d.useContext)(ce.aM),B=(0,u.F)(K,R),_=Ae(m)||!!q,Ee=(0,d.useRef)(_),ee=(0,Pe.Z)(A,!0),pe=J=>{ee(),U==null||U(J)},ge=J=>{ee(),F==null||F(J)},V=J=>{ee(),Z==null||Z(J)},se=(q||P)&&d.createElement(d.Fragment,null,P,q&&p),we=(0,e.Z)(M!=null?M:H),[Re,be]=(0,Ce.Z)("input",ne,g);return oe(I(d.createElement(y.Z,Object.assign({ref:(0,N.sQ)(T,A),prefixCls:c,autoComplete:b},j,{disabled:me,onBlur:pe,onFocus:ge,style:Object.assign(Object.assign({},Y),Q),styles:Object.assign(Object.assign({},ae),ye),suffix:se,allowClear:we,className:s()(G,X,ve,v,re,E),onChange:V,addonBefore:fe&&d.createElement(a.Z,{form:!0,space:!0},fe),addonAfter:de&&d.createElement(a.Z,{form:!0,space:!0},de),classNames:Object.assign(Object.assign(Object.assign({},$),te),{input:s()({[`${c}-sm`]:w==="small",[`${c}-lg`]:w==="large",[`${c}-rtl`]:r==="rtl"},$==null?void 0:$.input,te.input,L),variant:s()({[`${c}-${Re}`]:be},(0,u.Z)(c,B)),affixWrapper:s()({[`${c}-affix-wrapper-sm`]:w==="small",[`${c}-affix-wrapper-lg`]:w==="large",[`${c}-affix-wrapper-rtl`]:r==="rtl"},L),wrapper:s()({[`${c}-group-rtl`]:r==="rtl"},L),groupWrapper:s()({[`${c}-group-wrapper-sm`]:w==="small",[`${c}-group-wrapper-lg`]:w==="large",[`${c}-group-wrapper-rtl`]:r==="rtl",[`${c}-group-wrapper-${Re}`]:be},(0,u.Z)(`${c}-group-wrapper`,B,q),L)})}))))})},72922:function(he,D,t){t.d(D,{Z:function(){return C}});var d=t(67294);function C(s,y){const N=(0,d.useRef)([]),a=()=>{N.current.push(setTimeout(()=>{var e,u,o,i;!((e=s.current)===null||e===void 0)&&e.input&&((u=s.current)===null||u===void 0?void 0:u.input.getAttribute("type"))==="password"&&(!((o=s.current)===null||o===void 0)&&o.input.hasAttribute("value"))&&((i=s.current)===null||i===void 0||i.input.removeAttribute("value"))}))};return(0,d.useEffect)(()=>(y&&a(),()=>N.current.forEach(e=>{e&&clearTimeout(e)})),[]),a}},82234:function(he,D,t){t.d(D,{Z:function(){return e}});var d=t(91),C=t(1413),s=t(71002),y=t(67294),N=["show"];function a(u,o){if(!o.max)return!0;var i=o.strategy(u);return i<=o.max}function e(u,o){return y.useMemo(function(){var i={};o&&(i.show=(0,s.Z)(o)==="object"&&o.formatter?o.formatter:!!o),i=(0,C.Z)((0,C.Z)({},i),u);var ie=i,z=ie.show,ce=(0,d.Z)(ie,N);return(0,C.Z)((0,C.Z)({},ce),{},{show:!!z,showFormatter:typeof z=="function"?z:void 0,strategy:ce.strategy||function(Ce){return Ce.length}})},[u,o])}},67656:function(he,D,t){t.d(D,{Q:function(){return i},Z:function(){return De}});var d=t(1413),C=t(87462),s=t(4942),y=t(71002),N=t(93967),a=t.n(N),e=t(67294),u=t(87887),o=e.forwardRef(function(n,m){var T,O,g,R=n.inputElement,W=n.children,S=n.prefixCls,U=n.prefix,F=n.suffix,P=n.addonBefore,M=n.addonAfter,de=n.className,fe=n.style,G=n.disabled,Q=n.readOnly,ye=n.focused,X=n.triggerFocus,Z=n.allowClear,$=n.value,ne=n.handleReset,j=n.hidden,x=n.classes,r=n.classNames,H=n.dataAttrs,b=n.styles,E=n.components,Y=n.onClear,te=W!=null?W:R,ae=(E==null?void 0:E.affixWrapper)||"span",c=(E==null?void 0:E.groupWrapper)||"span",A=(E==null?void 0:E.wrapper)||"span",v=(E==null?void 0:E.groupAddon)||"span",oe=(0,e.useRef)(null),L=function(V){var se;(se=oe.current)!==null&&se!==void 0&&se.contains(V.target)&&(X==null||X())},ve=(0,u.X3)(n),I=(0,e.cloneElement)(te,{value:$,className:a()((T=te.props)===null||T===void 0?void 0:T.className,!ve&&(r==null?void 0:r.variant))||null}),k=(0,e.useRef)(null);if(e.useImperativeHandle(m,function(){return{nativeElement:k.current||oe.current}}),ve){var re=null;if(Z){var w=!G&&!Q&&$,le="".concat(S,"-clear-icon"),me=(0,y.Z)(Z)==="object"&&Z!==null&&Z!==void 0&&Z.clearIcon?Z.clearIcon:"\u2716";re=e.createElement("button",{type:"button",tabIndex:-1,onClick:function(V){ne==null||ne(V),Y==null||Y()},onMouseDown:function(V){return V.preventDefault()},className:a()(le,(0,s.Z)((0,s.Z)({},"".concat(le,"-hidden"),!w),"".concat(le,"-has-suffix"),!!F))},me)}var K="".concat(S,"-affix-wrapper"),q=a()(K,(0,s.Z)((0,s.Z)((0,s.Z)((0,s.Z)((0,s.Z)({},"".concat(S,"-disabled"),G),"".concat(K,"-disabled"),G),"".concat(K,"-focused"),ye),"".concat(K,"-readonly"),Q),"".concat(K,"-input-with-clear-btn"),F&&Z&&$),x==null?void 0:x.affixWrapper,r==null?void 0:r.affixWrapper,r==null?void 0:r.variant),p=(F||Z)&&e.createElement("span",{className:a()("".concat(S,"-suffix"),r==null?void 0:r.suffix),style:b==null?void 0:b.suffix},re,F);I=e.createElement(ae,(0,C.Z)({className:q,style:b==null?void 0:b.affixWrapper,onClick:L},H==null?void 0:H.affixWrapper,{ref:oe}),U&&e.createElement("span",{className:a()("".concat(S,"-prefix"),r==null?void 0:r.prefix),style:b==null?void 0:b.prefix},U),I,p)}if((0,u.He)(n)){var B="".concat(S,"-group"),_="".concat(B,"-addon"),Ee="".concat(B,"-wrapper"),ee=a()("".concat(S,"-wrapper"),B,x==null?void 0:x.wrapper,r==null?void 0:r.wrapper),pe=a()(Ee,(0,s.Z)({},"".concat(Ee,"-disabled"),G),x==null?void 0:x.group,r==null?void 0:r.groupWrapper);I=e.createElement(c,{className:pe,ref:k},e.createElement(A,{className:ee},P&&e.createElement(v,{className:_},P),I,M&&e.createElement(v,{className:_},M)))}return e.cloneElement(I,{className:a()((O=I.props)===null||O===void 0?void 0:O.className,de)||null,style:(0,d.Z)((0,d.Z)({},(g=I.props)===null||g===void 0?void 0:g.style),fe),hidden:j})}),i=o,ie=t(74902),z=t(97685),ce=t(91),Ce=t(21770),Oe=t(98423),Pe=t(82234),Ne=["autoComplete","onChange","onFocus","onBlur","onPressEnter","onKeyDown","onKeyUp","prefixCls","disabled","htmlSize","className","maxLength","suffix","showCount","count","type","classes","classNames","styles","onCompositionStart","onCompositionEnd"],Ae=(0,e.forwardRef)(function(n,m){var T=n.autoComplete,O=n.onChange,g=n.onFocus,R=n.onBlur,W=n.onPressEnter,S=n.onKeyDown,U=n.onKeyUp,F=n.prefixCls,P=F===void 0?"rc-input":F,M=n.disabled,de=n.htmlSize,fe=n.className,G=n.maxLength,Q=n.suffix,ye=n.showCount,X=n.count,Z=n.type,$=Z===void 0?"text":Z,ne=n.classes,j=n.classNames,x=n.styles,r=n.onCompositionStart,H=n.onCompositionEnd,b=(0,ce.Z)(n,Ne),E=(0,e.useState)(!1),Y=(0,z.Z)(E,2),te=Y[0],ae=Y[1],c=(0,e.useRef)(!1),A=(0,e.useRef)(!1),v=(0,e.useRef)(null),oe=(0,e.useRef)(null),L=function(l){v.current&&(0,u.nH)(v.current,l)},ve=(0,Ce.Z)(n.defaultValue,{value:n.value}),I=(0,z.Z)(ve,2),k=I[0],re=I[1],w=k==null?"":String(k),le=(0,e.useState)(null),me=(0,z.Z)(le,2),K=me[0],q=me[1],p=(0,Pe.Z)(X,ye),B=p.max||G,_=p.strategy(w),Ee=!!B&&_>B;(0,e.useImperativeHandle)(m,function(){var f;return{focus:L,blur:function(){var h;(h=v.current)===null||h===void 0||h.blur()},setSelectionRange:function(h,Ze,xe){var ue;(ue=v.current)===null||ue===void 0||ue.setSelectionRange(h,Ze,xe)},select:function(){var h;(h=v.current)===null||h===void 0||h.select()},input:v.current,nativeElement:((f=oe.current)===null||f===void 0?void 0:f.nativeElement)||v.current}}),(0,e.useEffect)(function(){A.current&&(A.current=!1),ae(function(f){return f&&M?!1:f})},[M]);var ee=function(l,h,Ze){var xe=h;if(!c.current&&p.exceedFormatter&&p.max&&p.strategy(h)>p.max){if(xe=p.exceedFormatter(h,{max:p.max}),h!==xe){var ue,Be;q([((ue=v.current)===null||ue===void 0?void 0:ue.selectionStart)||0,((Be=v.current)===null||Be===void 0?void 0:Be.selectionEnd)||0])}}else if(Ze.source==="compositionEnd")return;re(xe),v.current&&(0,u.rJ)(v.current,l,O,xe)};(0,e.useEffect)(function(){if(K){var f;(f=v.current)===null||f===void 0||f.setSelectionRange.apply(f,(0,ie.Z)(K))}},[K]);var pe=function(l){ee(l,l.target.value,{source:"change"})},ge=function(l){c.current=!1,ee(l,l.currentTarget.value,{source:"compositionEnd"}),H==null||H(l)},V=function(l){W&&l.key==="Enter"&&!A.current&&(A.current=!0,W(l)),S==null||S(l)},se=function(l){l.key==="Enter"&&(A.current=!1),U==null||U(l)},we=function(l){ae(!0),g==null||g(l)},Re=function(l){A.current&&(A.current=!1),ae(!1),R==null||R(l)},be=function(l){re(""),L(),v.current&&(0,u.rJ)(v.current,l,O)},J=Ee&&"".concat(P,"-out-of-range"),Se=function(){var l=(0,Oe.Z)(n,["prefixCls","onPressEnter","addonBefore","addonAfter","prefix","suffix","allowClear","defaultValue","showCount","count","classes","htmlSize","styles","classNames","onClear"]);return e.createElement("input",(0,C.Z)({autoComplete:T},l,{onChange:pe,onFocus:we,onBlur:Re,onKeyDown:V,onKeyUp:se,className:a()(P,(0,s.Z)({},"".concat(P,"-disabled"),M),j==null?void 0:j.input),style:x==null?void 0:x.input,ref:v,size:de,type:$,onCompositionStart:function(Ze){c.current=!0,r==null||r(Ze)},onCompositionEnd:ge}))},Fe=function(){var l=Number(B)>0;if(Q||p.show){var h=p.showFormatter?p.showFormatter({value:w,count:_,maxLength:B}):"".concat(_).concat(l?" / ".concat(B):"");return e.createElement(e.Fragment,null,p.show&&e.createElement("span",{className:a()("".concat(P,"-show-count-suffix"),(0,s.Z)({},"".concat(P,"-show-count-has-suffix"),!!Q),j==null?void 0:j.count),style:(0,d.Z)({},x==null?void 0:x.count)},h),Q)}return null};return e.createElement(i,(0,C.Z)({},b,{prefixCls:P,className:a()(fe,J),handleReset:be,value:w,focused:te,triggerFocus:L,suffix:Fe(),disabled:M,classes:ne,classNames:j,styles:x}),Se())}),Ie=Ae,De=Ie},87887:function(he,D,t){t.d(D,{He:function(){return d},X3:function(){return C},nH:function(){return N},rJ:function(){return y}});function d(a){return!!(a.addonBefore||a.addonAfter)}function C(a){return!!(a.prefix||a.suffix||a.allowClear)}function s(a,e,u){var o=e.cloneNode(!0),i=Object.create(a,{target:{value:o},currentTarget:{value:o}});return o.value=u,typeof e.selectionStart=="number"&&typeof e.selectionEnd=="number"&&(o.selectionStart=e.selectionStart,o.selectionEnd=e.selectionEnd),o.setSelectionRange=function(){e.setSelectionRange.apply(e,arguments)},i}function y(a,e,u,o){if(u){var i=e;if(e.type==="click"){i=s(e,a,""),u(i);return}if(a.type!=="file"&&o!==void 0){i=s(e,a,o),u(i);return}u(i)}}function N(a,e){if(a){a.focus(e);var u=e||{},o=u.cursor;if(o){var i=a.value.length;switch(o){case"start":a.setSelectionRange(0,0);break;case"end":a.setSelectionRange(i,i);break;default:a.setSelectionRange(0,i)}}}}}}]);