解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/3553.38cd1b21.async.js b/ruoyi-admin/src/main/resources/static/3553.38cd1b21.async.js
new file mode 100644
index 0000000..af510de
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/3553.38cd1b21.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[3553,3628,8213,1316,1256],{31199:function(X,D,o){var r=o(1413),P=o(91),g=o(67294),f=o(92179),M=o(85893),x=["fieldProps","min","proFieldProps","max"],y=function(i,S){var F=i.fieldProps,v=i.min,c=i.proFieldProps,p=i.max,d=(0,P.Z)(i,x);return(0,M.jsx)(f.Z,(0,r.Z)({valueType:"digit",fieldProps:(0,r.Z)({min:v,max:p},F),ref:S,filedConfig:{defaultProps:{width:"100%"}},proFieldProps:c},d))},b=g.forwardRef(y);D.Z=b},86615:function(X,D,o){var r=o(1413),P=o(91),g=o(22270),f=o(78045),M=o(67294),x=o(90789),y=o(92179),b=o(85893),_=["fieldProps","options","radioType","layout","proFieldProps","valueEnum"],i=M.forwardRef(function(c,p){var d=c.fieldProps,E=c.options,I=c.radioType,s=c.layout,n=c.proFieldProps,h=c.valueEnum,m=(0,P.Z)(c,_);return(0,b.jsx)(y.Z,(0,r.Z)((0,r.Z)({valueType:I==="button"?"radioButton":"radio",ref:p,valueEnum:(0,g.h)(h,void 0)},m),{},{fieldProps:(0,r.Z)({options:E,layout:s},d),proFieldProps:n,filedConfig:{customLightMode:!0}}))}),S=M.forwardRef(function(c,p){var d=c.fieldProps,E=c.children;return(0,b.jsx)(f.ZP,(0,r.Z)((0,r.Z)({},d),{},{ref:p,children:E}))}),F=(0,x.G)(S,{valuePropName:"checked",ignoreWidth:!0}),v=F;v.Group=i,v.Button=f.ZP.Button,v.displayName="ProFormComponent",D.Z=v},64317:function(X,D,o){var r=o(1413),P=o(91),g=o(22270),f=o(67294),M=o(66758),x=o(92179),y=o(85893),b=["fieldProps","children","params","proFieldProps","mode","valueEnum","request","showSearch","options"],_=["fieldProps","children","params","proFieldProps","mode","valueEnum","request","options"],i=function(d,E){var I=d.fieldProps,s=d.children,n=d.params,h=d.proFieldProps,m=d.mode,Z=d.valueEnum,W=d.request,j=d.showSearch,C=d.options,L=(0,P.Z)(d,b),A=(0,f.useContext)(M.Z);return(0,y.jsx)(x.Z,(0,r.Z)((0,r.Z)({valueEnum:(0,g.h)(Z),request:W,params:n,valueType:"select",filedConfig:{customLightMode:!0},fieldProps:(0,r.Z)({options:C,mode:m,showSearch:j,getPopupContainer:A.getPopupContainer},I),ref:E,proFieldProps:h},L),{},{children:s}))},S=f.forwardRef(function(p,d){var E=p.fieldProps,I=p.children,s=p.params,n=p.proFieldProps,h=p.mode,m=p.valueEnum,Z=p.request,W=p.options,j=(0,P.Z)(p,_),C=(0,r.Z)({options:W,mode:h||"multiple",labelInValue:!0,showSearch:!0,suffixIcon:null,autoClearSearchValue:!0,optionLabelProp:"label"},E),L=(0,f.useContext)(M.Z);return(0,y.jsx)(x.Z,(0,r.Z)((0,r.Z)({valueEnum:(0,g.h)(m),request:Z,params:s,valueType:"select",filedConfig:{customLightMode:!0},fieldProps:(0,r.Z)({getPopupContainer:L.getPopupContainer},C),ref:d,proFieldProps:n},j),{},{children:I}))}),F=f.forwardRef(i),v=S,c=F;c.SearchSelect=v,c.displayName="ProFormComponent",D.Z=c},90672:function(X,D,o){var r=o(1413),P=o(91),g=o(67294),f=o(92179),M=o(85893),x=["fieldProps","proFieldProps"],y=function(_,i){var S=_.fieldProps,F=_.proFieldProps,v=(0,P.Z)(_,x);return(0,M.jsx)(f.Z,(0,r.Z)({ref:i,valueType:"textarea",fieldProps:S,proFieldProps:F},v))};D.Z=g.forwardRef(y)},5966:function(X,D,o){var r=o(97685),P=o(1413),g=o(91),f=o(21770),M=o(99859),x=o(55241),y=o(98423),b=o(67294),_=o(92179),i=o(85893),S=["fieldProps","proFieldProps"],F=["fieldProps","proFieldProps"],v="text",c=function(s){var n=s.fieldProps,h=s.proFieldProps,m=(0,g.Z)(s,S);return(0,i.jsx)(_.Z,(0,P.Z)({valueType:v,fieldProps:n,filedConfig:{valueType:v},proFieldProps:h},m))},p=function(s){var n=(0,f.Z)(s.open||!1,{value:s.open,onChange:s.onOpenChange}),h=(0,r.Z)(n,2),m=h[0],Z=h[1];return(0,i.jsx)(M.Z.Item,{shouldUpdate:!0,noStyle:!0,children:function(j){var C,L=j.getFieldValue(s.name||[]);return(0,i.jsx)(x.Z,(0,P.Z)((0,P.Z)({getPopupContainer:function(O){return O&&O.parentNode?O.parentNode:O},onOpenChange:function(O){return Z(O)},content:(0,i.jsxs)("div",{style:{padding:"4px 0"},children:[(C=s.statusRender)===null||C===void 0?void 0:C.call(s,L),s.strengthText?(0,i.jsx)("div",{style:{marginTop:10},children:(0,i.jsx)("span",{children:s.strengthText})}):null]}),overlayStyle:{width:240},placement:"rightTop"},s.popoverProps),{},{open:m,children:s.children}))}})},d=function(s){var n=s.fieldProps,h=s.proFieldProps,m=(0,g.Z)(s,F),Z=(0,b.useState)(!1),W=(0,r.Z)(Z,2),j=W[0],C=W[1];return n!=null&&n.statusRender&&m.name?(0,i.jsx)(p,{name:m.name,statusRender:n==null?void 0:n.statusRender,popoverProps:n==null?void 0:n.popoverProps,strengthText:n==null?void 0:n.strengthText,open:j,onOpenChange:C,children:(0,i.jsx)("div",{children:(0,i.jsx)(_.Z,(0,P.Z)({valueType:"password",fieldProps:(0,P.Z)((0,P.Z)({},(0,y.Z)(n,["statusRender","popoverProps","strengthText"])),{},{onBlur:function(A){var O;n==null||(O=n.onBlur)===null||O===void 0||O.call(n,A),C(!1)},onClick:function(A){var O;n==null||(O=n.onClick)===null||O===void 0||O.call(n,A),C(!0)}}),proFieldProps:h,filedConfig:{valueType:v}},m))})}):(0,i.jsx)(_.Z,(0,P.Z)({valueType:"password",fieldProps:n,proFieldProps:h,filedConfig:{valueType:v}},m))},E=c;E.Password=d,E.displayName="ProFormComponent",D.Z=E},66309:function(X,D,o){o.d(D,{Z:function(){return ie}});var r=o(67294),P=o(93967),g=o.n(P),f=o(98423),M=o(98787),x=o(69760),y=o(96159),b=o(45353),_=o(53124),i=o(11568),S=o(15063),F=o(14747),v=o(83262),c=o(83559);const p=e=>{const{paddingXXS:a,lineWidth:u,tagPaddingHorizontal:t,componentCls:l,calc:R}=e,T=R(t).sub(u).equal(),N=R(a).sub(u).equal();return{[l]:Object.assign(Object.assign({},(0,F.Wf)(e)),{display:"inline-block",height:"auto",marginInlineEnd:e.marginXS,paddingInline:T,fontSize:e.tagFontSize,lineHeight:e.tagLineHeight,whiteSpace:"nowrap",background:e.defaultBg,border:`${(0,i.bf)(e.lineWidth)} ${e.lineType} ${e.colorBorder}`,borderRadius:e.borderRadiusSM,opacity:1,transition:`all ${e.motionDurationMid}`,textAlign:"start",position:"relative",[`&${l}-rtl`]:{direction:"rtl"},"&, a, a:hover":{color:e.defaultColor},[`${l}-close-icon`]:{marginInlineStart:N,fontSize:e.tagIconSize,color:e.colorTextDescription,cursor:"pointer",transition:`all ${e.motionDurationMid}`,"&:hover":{color:e.colorTextHeading}},[`&${l}-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(${l}-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:T}}),[`${l}-borderless`]:{borderColor:"transparent",background:e.tagBorderlessBg}}},d=e=>{const{lineWidth:a,fontSizeIcon:u,calc:t}=e,l=e.fontSizeSM;return(0,v.IX)(e,{tagFontSize:l,tagLineHeight:(0,i.bf)(t(e.lineHeightSM).mul(l).equal()),tagIconSize:t(u).sub(t(a).mul(2)).equal(),tagPaddingHorizontal:8,tagBorderlessBg:e.defaultBg})},E=e=>({defaultBg:new S.t(e.colorFillQuaternary).onBackground(e.colorBgContainer).toHexString(),defaultColor:e.colorText});var I=(0,c.I$)("Tag",e=>{const a=d(e);return p(a)},E),s=function(e,a){var u={};for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&a.indexOf(t)<0&&(u[t]=e[t]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var l=0,t=Object.getOwnPropertySymbols(e);l<t.length;l++)a.indexOf(t[l])<0&&Object.prototype.propertyIsEnumerable.call(e,t[l])&&(u[t[l]]=e[t[l]]);return u},h=r.forwardRef((e,a)=>{const{prefixCls:u,style:t,className:l,checked:R,onChange:T,onClick:N}=e,U=s(e,["prefixCls","style","className","checked","onChange","onClick"]),{getPrefixCls:G,tag:K}=r.useContext(_.E_),Q=w=>{T==null||T(!R),N==null||N(w)},z=G("tag",u),[J,Y,$]=I(z),k=g()(z,`${z}-checkable`,{[`${z}-checkable-checked`]:R},K==null?void 0:K.className,l,Y,$);return J(r.createElement("span",Object.assign({},U,{ref:a,style:Object.assign(Object.assign({},t),K==null?void 0:K.style),className:k,onClick:Q})))}),m=o(98719);const Z=e=>(0,m.Z)(e,(a,u)=>{let{textColor:t,lightBorderColor:l,lightColor:R,darkColor:T}=u;return{[`${e.componentCls}${e.componentCls}-${a}`]:{color:t,background:R,borderColor:l,"&-inverse":{color:e.colorTextLightSolid,background:T,borderColor:T},[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}});var W=(0,c.bk)(["Tag","preset"],e=>{const a=d(e);return Z(a)},E);function j(e){return typeof e!="string"?e:e.charAt(0).toUpperCase()+e.slice(1)}const C=(e,a,u)=>{const t=j(u);return{[`${e.componentCls}${e.componentCls}-${a}`]:{color:e[`color${u}`],background:e[`color${t}Bg`],borderColor:e[`color${t}Border`],[`&${e.componentCls}-borderless`]:{borderColor:"transparent"}}}};var L=(0,c.bk)(["Tag","status"],e=>{const a=d(e);return[C(a,"success","Success"),C(a,"processing","Info"),C(a,"error","Error"),C(a,"warning","Warning")]},E),A=function(e,a){var u={};for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&a.indexOf(t)<0&&(u[t]=e[t]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var l=0,t=Object.getOwnPropertySymbols(e);l<t.length;l++)a.indexOf(t[l])<0&&Object.prototype.propertyIsEnumerable.call(e,t[l])&&(u[t[l]]=e[t[l]]);return u};const oe=r.forwardRef((e,a)=>{const{prefixCls:u,className:t,rootClassName:l,style:R,children:T,icon:N,color:U,onClose:G,bordered:K=!0,visible:Q}=e,z=A(e,["prefixCls","className","rootClassName","style","children","icon","color","onClose","bordered","visible"]),{getPrefixCls:J,direction:Y,tag:$}=r.useContext(_.E_),[k,w]=r.useState(!0),de=(0,f.Z)(z,["closeIcon","closable"]);r.useEffect(()=>{Q!==void 0&&w(Q)},[Q]);const re=(0,M.o2)(U),te=(0,M.yT)(U),q=re||te,ce=Object.assign(Object.assign({backgroundColor:U&&!q?U:void 0},$==null?void 0:$.style),R),B=J("tag",u),[ue,pe,Pe]=I(B),ve=g()(B,$==null?void 0:$.className,{[`${B}-${U}`]:q,[`${B}-has-color`]:U&&!q,[`${B}-hidden`]:!k,[`${B}-rtl`]:Y==="rtl",[`${B}-borderless`]:!K},t,l,pe,Pe),ne=V=>{V.stopPropagation(),G==null||G(V),!V.defaultPrevented&&w(!1)},[,me]=(0,x.Z)((0,x.w)(e),(0,x.w)($),{closable:!1,closeIconRender:V=>{const fe=r.createElement("span",{className:`${B}-close-icon`,onClick:ne},V);return(0,y.wm)(V,fe,H=>({onClick:se=>{var ee;(ee=H==null?void 0:H.onClick)===null||ee===void 0||ee.call(H,se),ne(se)},className:g()(H==null?void 0:H.className,`${B}-close-icon`)}))}}),Ce=typeof z.onClick=="function"||T&&T.type==="a",le=N||null,ge=le?r.createElement(r.Fragment,null,le,T&&r.createElement("span",null,T)):T,ae=r.createElement("span",Object.assign({},de,{ref:a,className:ve,style:ce}),ge,me,re&&r.createElement(W,{key:"preset",prefixCls:B}),te&&r.createElement(L,{key:"status",prefixCls:B}));return ue(Ce?r.createElement(b.Z,{component:"Tag"},ae):ae)});oe.CheckableTag=h;var ie=oe}}]);