解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/5826.0a097608.async.js b/ruoyi-admin/src/main/resources/static/5826.0a097608.async.js
new file mode 100644
index 0000000..64766b4
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/5826.0a097608.async.js
@@ -0,0 +1,2 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[5826],{84567:function(Ee,Y,n){n.d(Y,{Z:function(){return pe}});var t=n(67294),G=n(93967),g=n.n(G),A=n(50132),N=n(42550),V=n(45353),H=n(17415),_=n(53124),I=n(98866),se=n(35792),ve=n(65223),de=t.createContext(null),le=n(63185),q=n(5273),Ce=function(d,Z){var $={};for(var s in d)Object.prototype.hasOwnProperty.call(d,s)&&Z.indexOf(s)<0&&($[s]=d[s]);if(d!=null&&typeof Object.getOwnPropertySymbols=="function")for(var c=0,s=Object.getOwnPropertySymbols(d);c<s.length;c++)Z.indexOf(s[c])<0&&Object.prototype.propertyIsEnumerable.call(d,s[c])&&($[s[c]]=d[s[c]]);return $};const he=(d,Z)=>{var $;const{prefixCls:s,className:c,rootClassName:ce,children:W,indeterminate:te=!1,style:ne,onMouseEnter:E,onMouseLeave:k,skipGroup:ue=!1,disabled:xe}=d,f=Ce(d,["prefixCls","className","rootClassName","children","indeterminate","style","onMouseEnter","onMouseLeave","skipGroup","disabled"]),{getPrefixCls:be,direction:l,checkbox:a}=t.useContext(_.E_),r=t.useContext(de),{isFormItemInput:o}=t.useContext(ve.aM),e=t.useContext(I.Z),v=($=(r==null?void 0:r.disabled)||xe)!==null&&$!==void 0?$:e,C=t.useRef(f.value),y=t.useRef(null),u=(0,N.sQ)(Z,y);t.useEffect(()=>{r==null||r.registerValue(f.value)},[]),t.useEffect(()=>{if(!ue)return f.value!==C.current&&(r==null||r.cancelValue(C.current),r==null||r.registerValue(f.value),C.current=f.value),()=>r==null?void 0:r.cancelValue(f.value)},[f.value]),t.useEffect(()=>{var p;!((p=y.current)===null||p===void 0)&&p.input&&(y.current.input.indeterminate=te)},[te]);const h=be("checkbox",s),P=(0,se.Z)(h),[M,z,j]=(0,le.ZP)(h,P),O=Object.assign({},f);r&&!ue&&(O.onChange=function(){f.onChange&&f.onChange.apply(f,arguments),r.toggleOption&&r.toggleOption({label:W,value:f.value})},O.name=r.name,O.checked=r.value.includes(f.value));const L=g()(`${h}-wrapper`,{[`${h}-rtl`]:l==="rtl",[`${h}-wrapper-checked`]:O.checked,[`${h}-wrapper-disabled`]:v,[`${h}-wrapper-in-form-item`]:o},a==null?void 0:a.className,c,ce,j,P,z),i=g()({[`${h}-indeterminate`]:te},H.A,z),[m,b]=(0,q.Z)(O.onClick);return M(t.createElement(V.Z,{component:"Checkbox",disabled:v},t.createElement("label",{className:L,style:Object.assign(Object.assign({},a==null?void 0:a.style),ne),onMouseEnter:E,onMouseLeave:k,onClick:m},t.createElement(A.Z,Object.assign({},O,{onClick:b,prefixCls:h,className:i,disabled:v,ref:u})),W!==void 0&&t.createElement("span",{className:`${h}-label`},W))))};var oe=t.forwardRef(he),ae=n(74902),U=n(98423),F=function(d,Z){var $={};for(var s in d)Object.prototype.hasOwnProperty.call(d,s)&&Z.indexOf(s)<0&&($[s]=d[s]);if(d!=null&&typeof Object.getOwnPropertySymbols=="function")for(var c=0,s=Object.getOwnPropertySymbols(d);c<s.length;c++)Z.indexOf(s[c])<0&&Object.prototype.propertyIsEnumerable.call(d,s[c])&&($[s[c]]=d[s[c]]);return $},me=t.forwardRef((d,Z)=>{const{defaultValue:$,children:s,options:c=[],prefixCls:ce,className:W,rootClassName:te,style:ne,onChange:E}=d,k=F(d,["defaultValue","children","options","prefixCls","className","rootClassName","style","onChange"]),{getPrefixCls:ue,direction:xe}=t.useContext(_.E_),[f,be]=t.useState(k.value||$||[]),[l,a]=t.useState([]);t.useEffect(()=>{"value"in k&&be(k.value||[])},[k.value]);const r=t.useMemo(()=>c.map(i=>typeof i=="string"||typeof i=="number"?{label:i,value:i}:i),[c]),o=i=>{a(m=>m.filter(b=>b!==i))},e=i=>{a(m=>[].concat((0,ae.Z)(m),[i]))},v=i=>{const m=f.indexOf(i.value),b=(0,ae.Z)(f);m===-1?b.push(i.value):b.splice(m,1),"value"in k||be(b),E==null||E(b.filter(p=>l.includes(p)).sort((p,D)=>{const K=r.findIndex(X=>X.value===p),x=r.findIndex(X=>X.value===D);return K-x}))},C=ue("checkbox",ce),y=`${C}-group`,u=(0,se.Z)(C),[h,P,M]=(0,le.ZP)(C,u),z=(0,U.Z)(k,["value","disabled"]),j=c.length?r.map(i=>t.createElement(oe,{prefixCls:C,key:i.value.toString(),disabled:"disabled"in i?i.disabled:k.disabled,value:i.value,checked:f.includes(i.value),onChange:i.onChange,className:`${y}-item`,style:i.style,title:i.title,id:i.id,required:i.required},i.label)):s,O={toggleOption:v,value:f,disabled:k.disabled,name:k.name,registerValue:e,cancelValue:o},L=g()(y,{[`${y}-rtl`]:xe==="rtl"},W,te,M,u,P);return h(t.createElement("div",Object.assign({className:L,style:ne},z,{ref:Z}),t.createElement(de.Provider,{value:O},j)))});const ee=oe;ee.Group=me,ee.__ANT_CHECKBOX=!0;var pe=ee},5273:function(Ee,Y,n){n.d(Y,{Z:function(){return g}});var t=n(67294),G=n(75164);function g(A){const N=t.useRef(null),V=()=>{G.Z.cancel(N.current),N.current=null};return[()=>{V(),N.current=(0,G.Z)(()=>{N.current=null})},I=>{N.current&&(I.stopPropagation(),V()),A==null||A(I)}]}},78045:function(Ee,Y,n){n.d(Y,{ZP:function(){return be}});var t=n(67294),G=n(93967),g=n.n(G),A=n(21770),N=n(64217),V=n(53124),H=n(35792),_=n(98675);const I=t.createContext(null),se=I.Provider;var ve=I;const B=t.createContext(null),de=B.Provider;var le=n(50132),q=n(42550),Ce=n(45353),he=n(17415),ke=n(5273),oe=n(98866),ae=n(65223),U=n(11568),F=n(14747),ge=n(83559),me=n(83262);const ee=l=>{const{componentCls:a,antCls:r}=l,o=`${a}-group`;return{[o]:Object.assign(Object.assign({},(0,F.Wf)(l)),{display:"inline-block",fontSize:0,[`&${o}-rtl`]:{direction:"rtl"},[`&${o}-block`]:{display:"flex"},[`${r}-badge ${r}-badge-count`]:{zIndex:1},[`> ${r}-badge:not(:first-child) > ${r}-button-wrapper`]:{borderInlineStart:"none"}})}},pe=l=>{const{componentCls:a,wrapperMarginInlineEnd:r,colorPrimary:o,radioSize:e,motionDurationSlow:v,motionDurationMid:C,motionEaseInOutCirc:y,colorBgContainer:u,colorBorder:h,lineWidth:P,colorBgContainerDisabled:M,colorTextDisabled:z,paddingXS:j,dotColorDisabled:O,lineType:L,radioColor:i,radioBgColor:m,calc:b}=l,p=`${a}-inner`,K=b(e).sub(b(4).mul(2)),x=b(1).mul(e).equal({unit:!0});return{[`${a}-wrapper`]:Object.assign(Object.assign({},(0,F.Wf)(l)),{display:"inline-flex",alignItems:"baseline",marginInlineStart:0,marginInlineEnd:r,cursor:"pointer","&:last-child":{marginInlineEnd:0},[`&${a}-wrapper-rtl`]:{direction:"rtl"},"&-disabled":{cursor:"not-allowed",color:l.colorTextDisabled},"&::after":{display:"inline-block",width:0,overflow:"hidden",content:'"\\a0"'},"&-block":{flex:1,justifyContent:"center"},[`${a}-checked::after`]:{position:"absolute",insetBlockStart:0,insetInlineStart:0,width:"100%",height:"100%",border:`${(0,U.bf)(P)} ${L} ${o}`,borderRadius:"50%",visibility:"hidden",opacity:0,content:'""'},[a]:Object.assign(Object.assign({},(0,F.Wf)(l)),{position:"relative",display:"inline-block",outline:"none",cursor:"pointer",alignSelf:"center",borderRadius:"50%"}),[`${a}-wrapper:hover &,
+ &:hover ${p}`]:{borderColor:o},[`${a}-input:focus-visible + ${p}`]:Object.assign({},(0,F.oN)(l)),[`${a}:hover::after, ${a}-wrapper:hover &::after`]:{visibility:"visible"},[`${a}-inner`]:{"&::after":{boxSizing:"border-box",position:"absolute",insetBlockStart:"50%",insetInlineStart:"50%",display:"block",width:x,height:x,marginBlockStart:b(1).mul(e).div(-2).equal({unit:!0}),marginInlineStart:b(1).mul(e).div(-2).equal({unit:!0}),backgroundColor:i,borderBlockStart:0,borderInlineStart:0,borderRadius:x,transform:"scale(0)",opacity:0,transition:`all ${v} ${y}`,content:'""'},boxSizing:"border-box",position:"relative",insetBlockStart:0,insetInlineStart:0,display:"block",width:x,height:x,backgroundColor:u,borderColor:h,borderStyle:"solid",borderWidth:P,borderRadius:"50%",transition:`all ${C}`},[`${a}-input`]:{position:"absolute",inset:0,zIndex:1,cursor:"pointer",opacity:0},[`${a}-checked`]:{[p]:{borderColor:o,backgroundColor:m,"&::after":{transform:`scale(${l.calc(l.dotSize).div(e).equal()})`,opacity:1,transition:`all ${v} ${y}`}}},[`${a}-disabled`]:{cursor:"not-allowed",[p]:{backgroundColor:M,borderColor:h,cursor:"not-allowed","&::after":{backgroundColor:O}},[`${a}-input`]:{cursor:"not-allowed"},[`${a}-disabled + span`]:{color:z,cursor:"not-allowed"},[`&${a}-checked`]:{[p]:{"&::after":{transform:`scale(${b(K).div(e).equal()})`}}}},[`span${a} + *`]:{paddingInlineStart:j,paddingInlineEnd:j}})}},d=l=>{const{buttonColor:a,controlHeight:r,componentCls:o,lineWidth:e,lineType:v,colorBorder:C,motionDurationSlow:y,motionDurationMid:u,buttonPaddingInline:h,fontSize:P,buttonBg:M,fontSizeLG:z,controlHeightLG:j,controlHeightSM:O,paddingXS:L,borderRadius:i,borderRadiusSM:m,borderRadiusLG:b,buttonCheckedBg:p,buttonSolidCheckedColor:D,colorTextDisabled:K,colorBgContainerDisabled:x,buttonCheckedBgDisabled:X,buttonCheckedColorDisabled:ye,colorPrimary:w,colorPrimaryHover:re,colorPrimaryActive:S,buttonSolidCheckedBg:Q,buttonSolidCheckedHoverBg:J,buttonSolidCheckedActiveBg:ie,calc:T}=l;return{[`${o}-button-wrapper`]:{position:"relative",display:"inline-block",height:r,margin:0,paddingInline:h,paddingBlock:0,color:a,fontSize:P,lineHeight:(0,U.bf)(T(r).sub(T(e).mul(2)).equal()),background:M,border:`${(0,U.bf)(e)} ${v} ${C}`,borderBlockStartWidth:T(e).add(.02).equal(),borderInlineStartWidth:0,borderInlineEndWidth:e,cursor:"pointer",transition:[`color ${u}`,`background ${u}`,`box-shadow ${u}`].join(","),a:{color:a},[`> ${o}-button`]:{position:"absolute",insetBlockStart:0,insetInlineStart:0,zIndex:-1,width:"100%",height:"100%"},"&:not(:first-child)":{"&::before":{position:"absolute",insetBlockStart:T(e).mul(-1).equal(),insetInlineStart:T(e).mul(-1).equal(),display:"block",boxSizing:"content-box",width:1,height:"100%",paddingBlock:e,paddingInline:0,backgroundColor:C,transition:`background-color ${y}`,content:'""'}},"&:first-child":{borderInlineStart:`${(0,U.bf)(e)} ${v} ${C}`,borderStartStartRadius:i,borderEndStartRadius:i},"&:last-child":{borderStartEndRadius:i,borderEndEndRadius:i},"&:first-child:last-child":{borderRadius:i},[`${o}-group-large &`]:{height:j,fontSize:z,lineHeight:(0,U.bf)(T(j).sub(T(e).mul(2)).equal()),"&:first-child":{borderStartStartRadius:b,borderEndStartRadius:b},"&:last-child":{borderStartEndRadius:b,borderEndEndRadius:b}},[`${o}-group-small &`]:{height:O,paddingInline:T(L).sub(e).equal(),paddingBlock:0,lineHeight:(0,U.bf)(T(O).sub(T(e).mul(2)).equal()),"&:first-child":{borderStartStartRadius:m,borderEndStartRadius:m},"&:last-child":{borderStartEndRadius:m,borderEndEndRadius:m}},"&:hover":{position:"relative",color:w},"&:has(:focus-visible)":Object.assign({},(0,F.oN)(l)),[`${o}-inner, input[type='checkbox'], input[type='radio']`]:{width:0,height:0,opacity:0,pointerEvents:"none"},[`&-checked:not(${o}-button-wrapper-disabled)`]:{zIndex:1,color:w,background:p,borderColor:w,"&::before":{backgroundColor:w},"&:first-child":{borderColor:w},"&:hover":{color:re,borderColor:re,"&::before":{backgroundColor:re}},"&:active":{color:S,borderColor:S,"&::before":{backgroundColor:S}}},[`${o}-group-solid &-checked:not(${o}-button-wrapper-disabled)`]:{color:D,background:Q,borderColor:Q,"&:hover":{color:D,background:J,borderColor:J},"&:active":{color:D,background:ie,borderColor:ie}},"&-disabled":{color:K,backgroundColor:x,borderColor:C,cursor:"not-allowed","&:first-child, &:hover":{color:K,backgroundColor:x,borderColor:C}},[`&-disabled${o}-button-wrapper-checked`]:{color:ye,backgroundColor:X,borderColor:C,boxShadow:"none"},"&-block":{flex:1,textAlign:"center"}}}},Z=l=>{const{wireframe:a,padding:r,marginXS:o,lineWidth:e,fontSizeLG:v,colorText:C,colorBgContainer:y,colorTextDisabled:u,controlItemBgActiveDisabled:h,colorTextLightSolid:P,colorPrimary:M,colorPrimaryHover:z,colorPrimaryActive:j,colorWhite:O}=l,L=4,i=v,m=a?i-L*2:i-(L+e)*2;return{radioSize:i,dotSize:m,dotColorDisabled:u,buttonSolidCheckedColor:P,buttonSolidCheckedBg:M,buttonSolidCheckedHoverBg:z,buttonSolidCheckedActiveBg:j,buttonBg:y,buttonCheckedBg:y,buttonColor:C,buttonCheckedBgDisabled:h,buttonCheckedColorDisabled:u,buttonPaddingInline:r-e,wrapperMarginInlineEnd:o,radioColor:a?M:O,radioBgColor:a?y:M}};var $=(0,ge.I$)("Radio",l=>{const{controlOutline:a,controlOutlineWidth:r}=l,o=`0 0 0 ${(0,U.bf)(r)} ${a}`,e=o,v=(0,me.IX)(l,{radioFocusShadow:o,radioButtonFocusShadow:e});return[ee(v),pe(v),d(v)]},Z,{unitless:{radioSize:!0,dotSize:!0}}),s=function(l,a){var r={};for(var o in l)Object.prototype.hasOwnProperty.call(l,o)&&a.indexOf(o)<0&&(r[o]=l[o]);if(l!=null&&typeof Object.getOwnPropertySymbols=="function")for(var e=0,o=Object.getOwnPropertySymbols(l);e<o.length;e++)a.indexOf(o[e])<0&&Object.prototype.propertyIsEnumerable.call(l,o[e])&&(r[o[e]]=l[o[e]]);return r};const c=(l,a)=>{var r,o;const e=t.useContext(ve),v=t.useContext(B),{getPrefixCls:C,direction:y,radio:u}=t.useContext(V.E_),h=t.useRef(null),P=(0,q.sQ)(a,h),{isFormItemInput:M}=t.useContext(ae.aM),z=Oe=>{var Se,fe;(Se=l.onChange)===null||Se===void 0||Se.call(l,Oe),(fe=e==null?void 0:e.onChange)===null||fe===void 0||fe.call(e,Oe)},{prefixCls:j,className:O,rootClassName:L,children:i,style:m,title:b}=l,p=s(l,["prefixCls","className","rootClassName","children","style","title"]),D=C("radio",j),K=((e==null?void 0:e.optionType)||v)==="button",x=K?`${D}-button`:D,X=(0,H.Z)(D),[ye,w,re]=$(D,X),S=Object.assign({},p),Q=t.useContext(oe.Z);e&&(S.name=e.name,S.onChange=z,S.checked=l.value===e.value,S.disabled=(r=S.disabled)!==null&&r!==void 0?r:e.disabled),S.disabled=(o=S.disabled)!==null&&o!==void 0?o:Q;const J=g()(`${x}-wrapper`,{[`${x}-wrapper-checked`]:S.checked,[`${x}-wrapper-disabled`]:S.disabled,[`${x}-wrapper-rtl`]:y==="rtl",[`${x}-wrapper-in-form-item`]:M,[`${x}-wrapper-block`]:!!(e!=null&&e.block)},u==null?void 0:u.className,O,L,w,re,X),[ie,T]=(0,ke.Z)(S.onClick);return ye(t.createElement(Ce.Z,{component:"Radio",disabled:S.disabled},t.createElement("label",{className:J,style:Object.assign(Object.assign({},u==null?void 0:u.style),m),onMouseEnter:l.onMouseEnter,onMouseLeave:l.onMouseLeave,title:b,onClick:ie},t.createElement(le.Z,Object.assign({},S,{className:g()(S.className,{[he.A]:!K}),type:"radio",prefixCls:x,ref:P,onClick:T})),i!==void 0?t.createElement("span",{className:`${x}-label`},i):null)))};var W=t.forwardRef(c),te=n(7028);const ne=t.forwardRef((l,a)=>{const{getPrefixCls:r,direction:o}=t.useContext(V.E_),e=(0,te.Z)(),{prefixCls:v,className:C,rootClassName:y,options:u,buttonStyle:h="outline",disabled:P,children:M,size:z,style:j,id:O,optionType:L,name:i=e,defaultValue:m,value:b,block:p=!1,onChange:D,onMouseEnter:K,onMouseLeave:x,onFocus:X,onBlur:ye}=l,[w,re]=(0,A.Z)(m,{value:b}),S=t.useCallback(R=>{const Be=w,Pe=R.target.value;"value"in l||re(Pe),Pe!==Be&&(D==null||D(R))},[w,re,D]),Q=r("radio",v),J=`${Q}-group`,ie=(0,H.Z)(Q),[T,Oe,Se]=$(Q,ie);let fe=M;u&&u.length>0&&(fe=u.map(R=>typeof R=="string"||typeof R=="number"?t.createElement(W,{key:R.toString(),prefixCls:Q,disabled:P,value:R,checked:w===R},R):t.createElement(W,{key:`radio-group-value-options-${R.value}`,prefixCls:Q,disabled:R.disabled||P,value:R.value,checked:w===R.value,title:R.title,style:R.style,id:R.id,required:R.required},R.label)));const $e=(0,_.Z)(z),Re=g()(J,`${J}-${h}`,{[`${J}-${$e}`]:$e,[`${J}-rtl`]:o==="rtl",[`${J}-block`]:p},C,y,Oe,Se,ie),Ie=t.useMemo(()=>({onChange:S,value:w,disabled:P,name:i,optionType:L,block:p}),[S,w,P,i,L,p]);return T(t.createElement("div",Object.assign({},(0,N.Z)(l,{aria:!0,data:!0}),{className:Re,style:j,onMouseEnter:K,onMouseLeave:x,onFocus:X,onBlur:ye,id:O,ref:a}),t.createElement(se,{value:Ie},fe)))});var E=t.memo(ne),k=function(l,a){var r={};for(var o in l)Object.prototype.hasOwnProperty.call(l,o)&&a.indexOf(o)<0&&(r[o]=l[o]);if(l!=null&&typeof Object.getOwnPropertySymbols=="function")for(var e=0,o=Object.getOwnPropertySymbols(l);e<o.length;e++)a.indexOf(o[e])<0&&Object.prototype.propertyIsEnumerable.call(l,o[e])&&(r[o[e]]=l[o[e]]);return r};const ue=(l,a)=>{const{getPrefixCls:r}=t.useContext(V.E_),{prefixCls:o}=l,e=k(l,["prefixCls"]),v=r("radio",o);return t.createElement(de,{value:"button"},t.createElement(W,Object.assign({prefixCls:v},e,{type:"radio",ref:a})))};var xe=t.forwardRef(ue);const f=W;f.Button=xe,f.Group=E,f.__ANT_RADIO=!0;var be=f},50132:function(Ee,Y,n){var t=n(87462),G=n(1413),g=n(4942),A=n(97685),N=n(91),V=n(93967),H=n.n(V),_=n(21770),I=n(67294),se=["prefixCls","className","style","checked","disabled","defaultChecked","type","title","onChange"],ve=(0,I.forwardRef)(function(B,de){var le=B.prefixCls,q=le===void 0?"rc-checkbox":le,Ce=B.className,he=B.style,ke=B.checked,oe=B.disabled,ae=B.defaultChecked,U=ae===void 0?!1:ae,F=B.type,ge=F===void 0?"checkbox":F,me=B.title,ee=B.onChange,pe=(0,N.Z)(B,se),d=(0,I.useRef)(null),Z=(0,I.useRef)(null),$=(0,_.Z)(U,{value:ke}),s=(0,A.Z)($,2),c=s[0],ce=s[1];(0,I.useImperativeHandle)(de,function(){return{focus:function(E){var k;(k=d.current)===null||k===void 0||k.focus(E)},blur:function(){var E;(E=d.current)===null||E===void 0||E.blur()},input:d.current,nativeElement:Z.current}});var W=H()(q,Ce,(0,g.Z)((0,g.Z)({},"".concat(q,"-checked"),c),"".concat(q,"-disabled"),oe)),te=function(E){oe||("checked"in B||ce(E.target.checked),ee==null||ee({target:(0,G.Z)((0,G.Z)({},B),{},{type:ge,checked:E.target.checked}),stopPropagation:function(){E.stopPropagation()},preventDefault:function(){E.preventDefault()},nativeEvent:E.nativeEvent}))};return I.createElement("span",{className:W,title:me,style:he,ref:Z},I.createElement("input",(0,t.Z)({},pe,{className:"".concat(q,"-input"),ref:d,onChange:te,disabled:oe,checked:!!c,type:ge})),I.createElement("span",{className:"".concat(q,"-inner")}))});Y.Z=ve},64019:function(Ee,Y,n){n.d(Y,{Z:function(){return G}});var t=n(73935);function G(g,A,N,V){var H=t.unstable_batchedUpdates?function(I){t.unstable_batchedUpdates(N,I)}:N;return g!=null&&g.addEventListener&&g.addEventListener(A,H,V),{remove:function(){g!=null&&g.removeEventListener&&g.removeEventListener(A,H,V)}}}}}]);