解决合并冲突,并实现种子junit单元测试

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/7388.8568050b.async.js b/ruoyi-admin/src/main/resources/static/7388.8568050b.async.js
new file mode 100644
index 0000000..18a755a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/7388.8568050b.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[7388],{77388:function(u,t,n){n.r(t);var d=n(67294),e=n(85893),s=function(){return(0,e.jsx)("div",{children:"111"})};t.default=s}}]);