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

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/7332.ecc387ce.chunk.css b/ruoyi-admin/src/main/resources/static/7332.ecc387ce.chunk.css
new file mode 100644
index 0000000..7af1bca
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/7332.ecc387ce.chunk.css
@@ -0,0 +1 @@
+.avatarPreview{position:absolute;top:50%;transform:translate(50%,-50%);width:200px;height:200px;border-radius:50%;box-shadow:0 0 4px #ccc;overflow:hidden}