解决合并冲突,并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/9256.e0de0b1f.async.js b/ruoyi-admin/src/main/resources/static/9256.e0de0b1f.async.js
new file mode 100644
index 0000000..7df2c34
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/9256.e0de0b1f.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[9256],{19256:function(a,n,e){e.r(n);var d=e(67294),r=e(85893),u=function(){return(0,d.useEffect)(function(){var t=document.getElementById("bdIframe");if(t){var i=document.documentElement.clientWidth,c=document.documentElement.clientHeight;t.style.width="".concat(Number(i)-220,"px"),t.style.height="".concat(Number(c)-120,"px")}}),(0,r.jsx)("iframe",{style:{width:"100%",border:"0px",height:"100%"},src:"/api/druid/login.html",id:"bdIframe"})};n.default=u}}]);