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

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/6569.9029eabb.async.js b/ruoyi-admin/src/main/resources/static/6569.9029eabb.async.js
new file mode 100644
index 0000000..f320852
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/6569.9029eabb.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[6569],{76569:function(s,e,n){n.r(e)}}]);