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