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