解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/605.29012808.async.js b/ruoyi-admin/src/main/resources/static/605.29012808.async.js
new file mode 100644
index 0000000..0a25862
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/605.29012808.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[605],{10605:function(oe,S,e){e.r(S);var N=e(15009),b=e.n(N),i=e(99289),O=e.n(i),x=e(5574),T=e.n(x),E=e(67294),c=e(20863),H=e(2453),C=e(9025),o=e(85893),K=c.Z.DirectoryTree,Z=function(D){var l=(0,E.useState)([]),t=T()(l,2),y=t[0],j=t[1],$=(0,E.useState)([]),P=T()($,2),z=P[0],X=P[1],Y=(0,E.useState)(!0),Q=T()(Y,2),ue=Q[0],V=Q[1],k=function(){var m=O()(b()().mark(function L(){var d;return b()().wrap(function(M){for(;;)switch(M.prev=M.next){case 0:return d=H.ZP.loading("\u6B63\u5728\u67E5\u8BE2"),M.prev=1,M.next=4,(0,C.x7)({}).then(function(s){var p=[];p.push("1"),j(s),p.push(s[0].children[0].id),X(p),D.onSelect(s[0].children[0])});case 4:return d(),M.abrupt("return",!0);case 8:return M.prev=8,M.t0=M.catch(1),d(),M.abrupt("return",!1);case 12:case"end":return M.stop()}},L,null,[[1,8]])}));return function(){return m.apply(this,arguments)}}();(0,E.useEffect)(function(){k()},[]);var n=function(L,d){D.onSelect(d.node)},u=function(L){X(L),V(!1)};return(0,o.jsx)(K,{defaultExpandAll:!0,onExpand:u,expandedKeys:z,autoExpandParent:ue,onSelect:n,treeData:y})};S.default=Z},9025:function(oe,S,e){e.d(S,{Lj:function(){return z},Nq:function(){return D},PR:function(){return K},_L:function(){return j},az:function(){return $},cn:function(){return Z},gg:function(){return Q},kX:function(){return t},lE:function(){return C},tW:function(){return V},wp:function(){return Y},x7:function(){return k},xB:function(){return X}});var N=e(15009),b=e.n(N),i=e(97857),O=e.n(i),x=e(99289),T=e.n(x),E=e(31981),c=e(76772),H=e(30964);function C(n,u){return o.apply(this,arguments)}function o(){return o=T()(b()().mark(function n(u,m){return b()().wrap(function(d){for(;;)switch(d.prev=d.next){case 0:return d.abrupt("return",(0,c.request)("/api/system/user/list",O()({method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"},params:u},m||{})));case 1:case"end":return d.stop()}},n)})),o.apply(this,arguments)}function K(n,u){return(0,c.request)("/api/system/user/".concat(n),O()({method:"GET"},u||{}))}function Z(n,u){return g.apply(this,arguments)}function g(){return g=T()(b()().mark(function n(u,m){return b()().wrap(function(d){for(;;)switch(d.prev=d.next){case 0:return d.abrupt("return",(0,c.request)("/api/system/user",O()({method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:u},m||{})));case 1:case"end":return d.stop()}},n)})),g.apply(this,arguments)}function D(n,u){return l.apply(this,arguments)}function l(){return l=T()(b()().mark(function n(u,m){return b()().wrap(function(d){for(;;)switch(d.prev=d.next){case 0:return d.abrupt("return",(0,c.request)("/api/system/user",O()({method:"PUT",headers:{"Content-Type":"application/json;charset=UTF-8"},data:u},m||{})));case 1:case"end":return d.stop()}},n)})),l.apply(this,arguments)}function t(n,u){return y.apply(this,arguments)}function y(){return y=T()(b()().mark(function n(u,m){return b()().wrap(function(d){for(;;)switch(d.prev=d.next){case 0:return d.abrupt("return",(0,c.request)("/api/system/user/".concat(u),O()({method:"DELETE"},m||{})));case 1:case"end":return d.stop()}},n)})),y.apply(this,arguments)}function j(n,u){return(0,H.su)("/api/system/user/export",{params:n},"user_".concat(new Date().getTime(),".xlsx"))}function $(n,u){var m={userId:n,status:u};return(0,c.request)("/api/system/user/changeStatus",{method:"put",data:m})}function P(){return request("/api/system/user/profile",{method:"get"})}function z(n){return(0,c.request)("/api/system/user/profile",{method:"put",data:n})}function X(n,u){var m={userId:n,password:u};return(0,c.request)("/api/system/user/resetPwd",{method:"put",data:m})}function Y(n,u){var m={oldPassword:n,newPassword:u};return(0,c.request)("/api/system/user/profile/updatePwd",{method:"put",params:m})}function Q(n){return(0,c.request)("/api/system/user/profile/avatar",{method:"post",data:n})}function ue(n){return request("/system/user/authRole/"+n,{method:"get"})}function V(n){return(0,c.request)("/system/user/authRole",{method:"put",params:n})}function k(n){return new Promise(function(u){(0,c.request)("/api/system/user/deptTree",{method:"get",params:n}).then(function(m){if(m&&m.code===200){var L=(0,E.lt)(m.data);u(L)}else u([])})})}},30964:function(oe,S,e){e.d(S,{p6:function(){return C},su:function(){return o}});var N=e(15009),b=e.n(N),i=e(97857),O=e.n(i),x=e(99289),T=e.n(x),E=e(76772),c={xlsx:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",zip:"application/zip"};function H(g,D){var l=document.createElement("a"),t=new Blob([g.data],{type:D}),y=new RegExp("filename=([^;]+\\.[^\\.;]+);*"),j=decodeURI(g.headers["content-disposition"]),$=y.exec(j),P=$?$[1]:"file";P=P.replace(/"/g,""),l.style.display="none",l.href=URL.createObjectURL(t),l.setAttribute("download",P),document.body.appendChild(l),l.click(),URL.revokeObjectURL(l.href),document.body.removeChild(l)}function C(g){(0,E.request)(g,{method:"GET",responseType:"blob",getResponse:!0}).then(function(D){H(D,c.zip)})}function o(g,D,l){return K.apply(this,arguments)}function K(){return K=T()(b()().mark(function g(D,l,t){return b()().wrap(function(j){for(;;)switch(j.prev=j.next){case 0:return j.abrupt("return",(0,E.request)(D,O()(O()({},l),{},{method:"POST",responseType:"blob"})).then(function($){var P=document.createElement("a"),z=$;P.style.display="none",P.href=URL.createObjectURL(z),P.setAttribute("download",t),document.body.appendChild(P),P.click(),URL.revokeObjectURL(P.href),document.body.removeChild(P)}));case 1:case"end":return j.stop()}},g)})),K.apply(this,arguments)}function Z(g){window.location.href="/api/common/download?fileName=".concat(encodeURI(g),"&delete=",!0)}},31981:function(oe,S,e){e.d(S,{C2:function(){return b},lt:function(){return O}});var N=e(87735);function b(x,T,E,c,H,C){var o={id:T||"id",name:E||"name",parentId:c||"parentId",parentName:H||"parentName",childrenList:C||"children"},K=[],Z=[],g=[];x.forEach(function(l){var t=l,y=t[o.parentId];K[y]||(K[y]=[]),t.key=t[o.id],t.title=t[o.name],t.value=t[o.id],t[o.childrenList]=null,Z[t[o.id]]=t,K[y].push(t)}),x.forEach(function(l){var t=l,y=t[o.parentId];Z[y]||(t[o.parentName]="",g.push(t))});function D(l){var t=l;K[t[o.id]]&&(t[o.childrenList]||(t[o.childrenList]=[]),t[o.childrenList]=K[t[o.id]]),t[o.childrenList]&&t[o.childrenList].forEach(function(y){var j=y;j[o.parentName]=t[o.name],D(j)})}return g.forEach(function(l){D(l)}),g}var i=function(){return parse(window.location.href.split("?")[1])};function O(x){var T=x.map(function(E){var c={id:E.id,title:E.label,key:"".concat(E.id),value:E.id};return E.children&&(c.children=O(E.children)),c});return T}},20863:function(oe,S,e){e.d(S,{Z:function(){return M}});var N=e(70593),b=e(74902),i=e(67294),O=e(26911),x=e(95591),T=e(32319),E=e(93967),c=e.n(E),H=e(10225),C=e(1089),o=e(53124),K=e(29751),Z=e(33603),g=e(29691),D=e(40561);const l=4;function t(s){const{dropPosition:p,dropLevelOffset:h,prefixCls:a,indent:_,direction:r="ltr"}=s,f=r==="ltr"?"left":"right",v=r==="ltr"?"right":"left",R={[f]:-h*_+l,[v]:0};switch(p){case-1:R.top=-3;break;case 1:R.bottom=-3;break;default:R.bottom=-3,R[f]=_+l;break}return i.createElement("div",{style:R,className:`${a}-drop-indicator`})}var y=t,j=e(61639),P=i.forwardRef((s,p)=>{var h;const{getPrefixCls:a,direction:_,virtual:r,tree:f}=i.useContext(o.E_),{prefixCls:v,className:R,showIcon:U=!1,showLine:te,switcherIcon:le,switcherLoadingIcon:de,blockNode:ce=!1,children:pe,checkable:ne=!1,selectable:re=!0,draggable:J,motion:se,style:fe}=s,w=a("tree",v),he=a(),ae=se!=null?se:Object.assign(Object.assign({},(0,Z.Z)(he)),{motionAppear:!1}),be=Object.assign(Object.assign({},s),{checkable:ne,selectable:re,showIcon:U,motion:ae,blockNode:ce,showLine:!!te,dropIndicatorRender:y}),[F,I,G]=(0,D.ZP)(w),[,q]=(0,g.ZP)(),ee=q.paddingXS/2+(((h=q.Tree)===null||h===void 0?void 0:h.titleHeight)||q.controlHeightSM),Ee=i.useMemo(()=>{if(!J)return!1;let A={};switch(typeof J){case"function":A.nodeDraggable=J;break;case"object":A=Object.assign({},J);break;default:break}return A.icon!==!1&&(A.icon=A.icon||i.createElement(K.Z,null)),A},[J]),W=A=>i.createElement(j.Z,{prefixCls:w,switcherIcon:le,switcherLoadingIcon:de,treeNodeProps:A,showLine:te});return F(i.createElement(N.ZP,Object.assign({itemHeight:ee,ref:p,virtual:r},be,{style:Object.assign(Object.assign({},f==null?void 0:f.style),fe),prefixCls:w,className:c()({[`${w}-icon-hide`]:!U,[`${w}-block-node`]:ce,[`${w}-unselectable`]:!re,[`${w}-rtl`]:_==="rtl"},f==null?void 0:f.className,R,I,G),direction:_,checkable:ne&&i.createElement("span",{className:`${w}-checkbox-inner`}),selectable:re,switcherIcon:W,draggable:Ee}),pe))});const z=0,X=1,Y=2;function Q(s,p,h){const{key:a,children:_}=h;function r(f){const v=f[a],R=f[_];p(v,f)!==!1&&Q(R||[],p,h)}s.forEach(r)}function ue(s){let{treeData:p,expandedKeys:h,startKey:a,endKey:_,fieldNames:r}=s;const f=[];let v=z;if(a&&a===_)return[a];if(!a||!_)return[];function R(U){return U===a||U===_}return Q(p,U=>{if(v===Y)return!1;if(R(U)){if(f.push(U),v===z)v=X;else if(v===X)return v=Y,!1}else v===X&&f.push(U);return h.includes(U)},(0,C.w$)(r)),f}function V(s,p,h){const a=(0,b.Z)(p),_=[];return Q(s,(r,f)=>{const v=a.indexOf(r);return v!==-1&&(_.push(f),a.splice(v,1)),!!a.length},(0,C.w$)(h)),_}var k=function(s,p){var h={};for(var a in s)Object.prototype.hasOwnProperty.call(s,a)&&p.indexOf(a)<0&&(h[a]=s[a]);if(s!=null&&typeof Object.getOwnPropertySymbols=="function")for(var _=0,a=Object.getOwnPropertySymbols(s);_<a.length;_++)p.indexOf(a[_])<0&&Object.prototype.propertyIsEnumerable.call(s,a[_])&&(h[a[_]]=s[a[_]]);return h};function n(s){const{isLeaf:p,expanded:h}=s;return p?i.createElement(O.Z,null):h?i.createElement(x.Z,null):i.createElement(T.Z,null)}function u(s){let{treeData:p,children:h}=s;return p||(0,C.zn)(h)}const m=(s,p)=>{var{defaultExpandAll:h,defaultExpandParent:a,defaultExpandedKeys:_}=s,r=k(s,["defaultExpandAll","defaultExpandParent","defaultExpandedKeys"]);const f=i.useRef(null),v=i.useRef(null),R=()=>{const{keyEntities:F}=(0,C.I8)(u(r));let I;return h?I=Object.keys(F):a?I=(0,H.r7)(r.expandedKeys||_||[],F):I=r.expandedKeys||_||[],I},[U,te]=i.useState(r.selectedKeys||r.defaultSelectedKeys||[]),[le,de]=i.useState(()=>R());i.useEffect(()=>{"selectedKeys"in r&&te(r.selectedKeys)},[r.selectedKeys]),i.useEffect(()=>{"expandedKeys"in r&&de(r.expandedKeys)},[r.expandedKeys]);const ce=(F,I)=>{var G;return"expandedKeys"in r||de(F),(G=r.onExpand)===null||G===void 0?void 0:G.call(r,F,I)},pe=(F,I)=>{var G;const{multiple:q,fieldNames:ee}=r,{node:Ee,nativeEvent:W}=I,{key:A=""}=Ee,_e=u(r),me=Object.assign(Object.assign({},I),{selected:!0}),ge=(W==null?void 0:W.ctrlKey)||(W==null?void 0:W.metaKey),ve=W==null?void 0:W.shiftKey;let B;q&&ge?(B=F,f.current=A,v.current=B,me.selectedNodes=V(_e,B,ee)):q&&ve?(B=Array.from(new Set([].concat((0,b.Z)(v.current||[]),(0,b.Z)(ue({treeData:_e,expandedKeys:le,startKey:A,endKey:f.current,fieldNames:ee}))))),me.selectedNodes=V(_e,B,ee)):(B=[A],f.current=A,v.current=B,me.selectedNodes=V(_e,B,ee)),(G=r.onSelect)===null||G===void 0||G.call(r,B,me),"selectedKeys"in r||te(B)},{getPrefixCls:ne,direction:re}=i.useContext(o.E_),{prefixCls:J,className:se,showIcon:fe=!0,expandAction:w="click"}=r,he=k(r,["prefixCls","className","showIcon","expandAction"]),ae=ne("tree",J),be=c()(`${ae}-directory`,{[`${ae}-directory-rtl`]:re==="rtl"},se);return i.createElement(P,Object.assign({icon:n,ref:p,blockNode:!0},he,{showIcon:fe,expandAction:w,prefixCls:ae,className:be,expandedKeys:le,selectedKeys:U,onSelect:pe,onExpand:ce}))};var d=i.forwardRef(m);const ie=P;ie.DirectoryTree=d,ie.TreeNode=N.OF;var M=ie}}]);