解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/5400.6b37b4a8.async.js b/ruoyi-admin/src/main/resources/static/5400.6b37b4a8.async.js
new file mode 100644
index 0000000..3787b97
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/5400.6b37b4a8.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[5400,7629],{90672:function(W,i,e){var c=e(1413),a=e(91),h=e(67294),O=e(92179),j=e(85893),g=["fieldProps","proFieldProps"],x=function(l,t){var M=l.fieldProps,T=l.proFieldProps,P=(0,a.Z)(l,g);return(0,j.jsx)(O.Z,(0,c.Z)({ref:t,valueType:"textarea",fieldProps:M,proFieldProps:T},P))};i.Z=h.forwardRef(x)},5966:function(W,i,e){var c=e(97685),a=e(1413),h=e(91),O=e(21770),j=e(99859),g=e(55241),x=e(98423),m=e(67294),l=e(92179),t=e(85893),M=["fieldProps","proFieldProps"],T=["fieldProps","proFieldProps"],P="text",F=function(s){var n=s.fieldProps,o=s.proFieldProps,u=(0,h.Z)(s,M);return(0,t.jsx)(l.Z,(0,a.Z)({valueType:P,fieldProps:n,filedConfig:{valueType:P},proFieldProps:o},u))},R=function(s){var n=(0,O.Z)(s.open||!1,{value:s.open,onChange:s.onOpenChange}),o=(0,c.Z)(n,2),u=o[0],p=o[1];return(0,t.jsx)(j.Z.Item,{shouldUpdate:!0,noStyle:!0,children:function(E){var d,Z=E.getFieldValue(s.name||[]);return(0,t.jsx)(g.Z,(0,a.Z)((0,a.Z)({getPopupContainer:function(_){return _&&_.parentNode?_.parentNode:_},onOpenChange:function(_){return p(_)},content:(0,t.jsxs)("div",{style:{padding:"4px 0"},children:[(d=s.statusRender)===null||d===void 0?void 0:d.call(s,Z),s.strengthText?(0,t.jsx)("div",{style:{marginTop:10},children:(0,t.jsx)("span",{children:s.strengthText})}):null]}),overlayStyle:{width:240},placement:"rightTop"},s.popoverProps),{},{open:u,children:s.children}))}})},f=function(s){var n=s.fieldProps,o=s.proFieldProps,u=(0,h.Z)(s,T),p=(0,m.useState)(!1),v=(0,c.Z)(p,2),E=v[0],d=v[1];return n!=null&&n.statusRender&&u.name?(0,t.jsx)(R,{name:u.name,statusRender:n==null?void 0:n.statusRender,popoverProps:n==null?void 0:n.popoverProps,strengthText:n==null?void 0:n.strengthText,open:E,onOpenChange:d,children:(0,t.jsx)("div",{children:(0,t.jsx)(l.Z,(0,a.Z)({valueType:"password",fieldProps:(0,a.Z)((0,a.Z)({},(0,x.Z)(n,["statusRender","popoverProps","strengthText"])),{},{onBlur:function(D){var _;n==null||(_=n.onBlur)===null||_===void 0||_.call(n,D),d(!1)},onClick:function(D){var _;n==null||(_=n.onClick)===null||_===void 0||_.call(n,D),d(!0)}}),proFieldProps:o,filedConfig:{valueType:P}},u))})}):(0,t.jsx)(l.Z,(0,a.Z)({valueType:"password",fieldProps:n,proFieldProps:o,filedConfig:{valueType:P}},u))},A=F;A.Password=f,A.displayName="ProFormComponent",i.Z=A},35400:function(W,i,e){e.r(i);var c=e(15009),a=e.n(c),h=e(99289),O=e.n(h),j=e(5574),g=e.n(j),x=e(99859),m=e(71230),l=e(15746),t=e(2453),M=e(83622),T=e(67294),P=e(76772),F=e(19035),R=e(97269),f=e(5966),A=e(90672),r=e(85893),s=function(o){var u,p,v,E,d,Z=x.Z.useForm(),D=g()(Z,1),_=D[0],U=o.onStepSubmit;(0,T.useEffect)(function(){_.resetFields(),_.setFieldsValue({tableName:o.values.tableName})});var K=function(){var b=O()(a()().mark(function I(){var C;return a()().wrap(function(B){for(;;)switch(B.prev=B.next){case 0:return B.next=2,_.validateFields();case 2:C=B.sent,U&&U("base",C);case 4:case"end":return B.stop()}},I)}));return function(){return b.apply(this,arguments)}}();return(0,r.jsxs)(T.Fragment,{children:[(0,r.jsx)(m.Z,{children:(0,r.jsx)(l.Z,{span:24,children:(0,r.jsxs)(R.A,{form:_,onFinish:O()(a()().mark(function b(){return a()().wrap(function(C){for(;;)switch(C.prev=C.next){case 0:t.ZP.success("\u63D0\u4EA4\u6210\u529F");case 1:case"end":return C.stop()}},b)})),initialValues:{tableName:(u=o.values)===null||u===void 0?void 0:u.tableName,tableComment:(p=o.values)===null||p===void 0?void 0:p.tableComment,className:(v=o.values)===null||v===void 0?void 0:v.className,functionAuthor:(E=o.values)===null||E===void 0?void 0:E.functionAuthor,remark:(d=o.values)===null||d===void 0?void 0:d.remark},submitter:{resetButtonProps:{style:{display:"none"}},submitButtonProps:{style:{display:"none"}}},children:[(0,r.jsxs)(m.Z,{children:[(0,r.jsx)(l.Z,{span:12,order:1,children:(0,r.jsx)(f.Z,{name:"tableName",label:"\u8868\u540D\u79F0",rules:[{required:!0,message:"\u8868\u540D\u79F0\u4E0D\u53EF\u4E3A\u7A7A\u3002"}]})}),(0,r.jsx)(l.Z,{span:12,order:2,children:(0,r.jsx)(f.Z,{name:"tableComment",label:"\u8868\u63CF\u8FF0"})})]}),(0,r.jsxs)(m.Z,{children:[(0,r.jsx)(l.Z,{span:12,order:1,children:(0,r.jsx)(f.Z,{name:"className",label:"\u5B9E\u4F53\u7C7B\u540D\u79F0",rules:[{required:!0,message:"\u5B9E\u4F53\u7C7B\u540D\u79F0\u4E0D\u53EF\u4E3A\u7A7A\u3002"}]})}),(0,r.jsx)(l.Z,{span:12,order:2,children:(0,r.jsx)(f.Z,{name:"functionAuthor",label:"\u4F5C\u8005"})})]}),(0,r.jsx)(m.Z,{children:(0,r.jsx)(l.Z,{span:24,children:(0,r.jsx)(A.Z,{name:"remark",label:"\u5907\u6CE8"})})})]})})}),(0,r.jsxs)(m.Z,{justify:"center",children:[(0,r.jsx)(l.Z,{span:4,children:(0,r.jsx)(M.ZP,{type:"primary",className:F.Z.step_buttons,onClick:function(){P.history.back()},children:"\u8FD4\u56DE"})}),(0,r.jsx)(l.Z,{span:4,children:(0,r.jsx)(M.ZP,{type:"primary",onClick:K,children:"\u4E0B\u4E00\u6B65"})})]})]})};i.default=s},19035:function(W,i){i.Z={steps:"steps____stZD"}}}]);