解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/index.html b/ruoyi-admin/src/main/resources/static/index.html
new file mode 100644
index 0000000..64794d2
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<title>Ant Design Pro</title>
+<link rel="stylesheet" href="/umi.fe20e75b.css">
+<script async src="/scripts/loading.js"></script>
+<script src="/preload_helper.70f534aa.js"></script>
+</head>
+<body>
+<div id="root"></div>
+<script src="/umi.27203ac4.js"></script>
+</body>
+</html>
\ No newline at end of file