解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/6762.ed0fab48.async.js b/ruoyi-admin/src/main/resources/static/6762.ed0fab48.async.js
new file mode 100644
index 0000000..a354f2d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/6762.ed0fab48.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[6762],{31199:function(x,p,e){var l=e(1413),a=e(91),f=e(67294),F=e(92179),v=e(85893),M=["fieldProps","min","proFieldProps","max"],c=function(u,g){var O=u.fieldProps,d=u.min,_=u.proFieldProps,i=u.max,s=(0,a.Z)(u,M);return(0,v.jsx)(F.Z,(0,l.Z)({valueType:"digit",fieldProps:(0,l.Z)({min:d,max:i},O),ref:g,filedConfig:{defaultProps:{width:"100%"}},proFieldProps:_},s))},D=f.forwardRef(c);p.Z=D},86615:function(x,p,e){var l=e(1413),a=e(91),f=e(22270),F=e(78045),v=e(67294),M=e(90789),c=e(92179),D=e(85893),m=["fieldProps","options","radioType","layout","proFieldProps","valueEnum"],u=v.forwardRef(function(_,i){var s=_.fieldProps,T=_.options,B=_.radioType,r=_.layout,o=_.proFieldProps,P=_.valueEnum,t=(0,a.Z)(_,m);return(0,D.jsx)(c.Z,(0,l.Z)((0,l.Z)({valueType:B==="button"?"radioButton":"radio",ref:i,valueEnum:(0,f.h)(P,void 0)},t),{},{fieldProps:(0,l.Z)({options:T,layout:r},s),proFieldProps:o,filedConfig:{customLightMode:!0}}))}),g=v.forwardRef(function(_,i){var s=_.fieldProps,T=_.children;return(0,D.jsx)(F.ZP,(0,l.Z)((0,l.Z)({},s),{},{ref:i,children:T}))}),O=(0,M.G)(g,{valuePropName:"checked",ignoreWidth:!0}),d=O;d.Group=u,d.Button=F.ZP.Button,d.displayName="ProFormComponent",p.Z=d},90672:function(x,p,e){var l=e(1413),a=e(91),f=e(67294),F=e(92179),v=e(85893),M=["fieldProps","proFieldProps"],c=function(m,u){var g=m.fieldProps,O=m.proFieldProps,d=(0,a.Z)(m,M);return(0,v.jsx)(F.Z,(0,l.Z)({ref:u,valueType:"textarea",fieldProps:g,proFieldProps:O},d))};p.Z=f.forwardRef(c)},5966:function(x,p,e){var l=e(97685),a=e(1413),f=e(91),F=e(21770),v=e(99859),M=e(55241),c=e(98423),D=e(67294),m=e(92179),u=e(85893),g=["fieldProps","proFieldProps"],O=["fieldProps","proFieldProps"],d="text",_=function(r){var o=r.fieldProps,P=r.proFieldProps,t=(0,f.Z)(r,g);return(0,u.jsx)(m.Z,(0,a.Z)({valueType:d,fieldProps:o,filedConfig:{valueType:d},proFieldProps:P},t))},i=function(r){var o=(0,F.Z)(r.open||!1,{value:r.open,onChange:r.onOpenChange}),P=(0,l.Z)(o,2),t=P[0],R=P[1];return(0,u.jsx)(v.Z.Item,{shouldUpdate:!0,noStyle:!0,children:function(W){var C,A=W.getFieldValue(r.name||[]);return(0,u.jsx)(M.Z,(0,a.Z)((0,a.Z)({getPopupContainer:function(n){return n&&n.parentNode?n.parentNode:n},onOpenChange:function(n){return R(n)},content:(0,u.jsxs)("div",{style:{padding:"4px 0"},children:[(C=r.statusRender)===null||C===void 0?void 0:C.call(r,A),r.strengthText?(0,u.jsx)("div",{style:{marginTop:10},children:(0,u.jsx)("span",{children:r.strengthText})}):null]}),overlayStyle:{width:240},placement:"rightTop"},r.popoverProps),{},{open:t,children:r.children}))}})},s=function(r){var o=r.fieldProps,P=r.proFieldProps,t=(0,f.Z)(r,O),R=(0,D.useState)(!1),E=(0,l.Z)(R,2),W=E[0],C=E[1];return o!=null&&o.statusRender&&t.name?(0,u.jsx)(i,{name:t.name,statusRender:o==null?void 0:o.statusRender,popoverProps:o==null?void 0:o.popoverProps,strengthText:o==null?void 0:o.strengthText,open:W,onOpenChange:C,children:(0,u.jsx)("div",{children:(0,u.jsx)(m.Z,(0,a.Z)({valueType:"password",fieldProps:(0,a.Z)((0,a.Z)({},(0,c.Z)(o,["statusRender","popoverProps","strengthText"])),{},{onBlur:function(h){var n;o==null||(n=o.onBlur)===null||n===void 0||n.call(o,h),C(!1)},onClick:function(h){var n;o==null||(n=o.onClick)===null||n===void 0||n.call(o,h),C(!0)}}),proFieldProps:P,filedConfig:{valueType:d}},t))})}):(0,u.jsx)(m.Z,(0,a.Z)({valueType:"password",fieldProps:o,proFieldProps:P,filedConfig:{valueType:d}},t))},T=_;T.Password=s,T.displayName="ProFormComponent",p.Z=T},96762:function(x,p,e){e.r(p);var l=e(15009),a=e.n(l),f=e(99289),F=e.n(f),v=e(5574),M=e.n(v),c=e(67294),D=e(97269),m=e(31199),u=e(5966),g=e(90672),O=e(86615),d=e(99859),_=e(17788),i=e(76772),s=e(85893),T=function(r){var o=d.Z.useForm(),P=M()(o,1),t=P[0],R=r.configTypeOptions;(0,c.useEffect)(function(){t.resetFields(),t.setFieldsValue({configId:r.values.configId,configName:r.values.configName,configKey:r.values.configKey,configValue:r.values.configValue,configType:r.values.configType,createBy:r.values.createBy,createTime:r.values.createTime,updateBy:r.values.updateBy,updateTime:r.values.updateTime,remark:r.values.remark})},[t,r]);var E=(0,i.useIntl)(),W=function(){t.submit()},C=function(){r.onCancel()},A=function(){var h=F()(a()().mark(function n(y){return a()().wrap(function(j){for(;;)switch(j.prev=j.next){case 0:r.onSubmit(y);case 1:case"end":return j.stop()}},n)}));return function(y){return h.apply(this,arguments)}}();return(0,s.jsx)(_.Z,{width:640,title:E.formatMessage({id:"system.config.title",defaultMessage:"\u7F16\u8F91\u53C2\u6570\u914D\u7F6E"}),open:r.open,forceRender:!0,destroyOnClose:!0,onOk:W,onCancel:C,children:(0,s.jsxs)(D.A,{form:t,grid:!0,submitter:!1,layout:"horizontal",onFinish:A,children:[(0,s.jsx)(m.Z,{name:"configId",label:E.formatMessage({id:"system.config.config_id",defaultMessage:"\u53C2\u6570\u4E3B\u952E"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u53C2\u6570\u4E3B\u952E",disabled:!0,hidden:!0,rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u53C2\u6570\u4E3B\u952E\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u53C2\u6570\u4E3B\u952E\uFF01"})}]}),(0,s.jsx)(u.Z,{name:"configName",label:E.formatMessage({id:"system.config.config_name",defaultMessage:"\u53C2\u6570\u540D\u79F0"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u53C2\u6570\u540D\u79F0",rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u53C2\u6570\u540D\u79F0\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u53C2\u6570\u540D\u79F0\uFF01"})}]}),(0,s.jsx)(u.Z,{name:"configKey",label:E.formatMessage({id:"system.config.config_key",defaultMessage:"\u53C2\u6570\u952E\u540D"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u540D",rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u540D\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u540D\uFF01"})}]}),(0,s.jsx)(g.Z,{name:"configValue",label:E.formatMessage({id:"system.config.config_value",defaultMessage:"\u53C2\u6570\u952E\u503C"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u503C",rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u503C\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u53C2\u6570\u952E\u503C\uFF01"})}]}),(0,s.jsx)(O.Z.Group,{valueEnum:R,name:"configType",label:E.formatMessage({id:"system.config.config_type",defaultMessage:"\u7CFB\u7EDF\u5185\u7F6E"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u7CFB\u7EDF\u5185\u7F6E",rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u7CFB\u7EDF\u5185\u7F6E\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u7CFB\u7EDF\u5185\u7F6E\uFF01"})}]}),(0,s.jsx)(g.Z,{name:"remark",label:E.formatMessage({id:"system.config.remark",defaultMessage:"\u5907\u6CE8"}),colProps:{md:24},placeholder:"\u8BF7\u8F93\u5165\u5907\u6CE8",rules:[{required:!1,message:(0,s.jsx)(i.FormattedMessage,{id:"\u8BF7\u8F93\u5165\u5907\u6CE8\uFF01",defaultMessage:"\u8BF7\u8F93\u5165\u5907\u6CE8\uFF01"})}]})]})})};p.default=T}}]);