解决合并冲突,并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/2654.4e4df7ef.chunk.css b/ruoyi-admin/src/main/resources/static/2654.4e4df7ef.chunk.css
new file mode 100644
index 0000000..d20c794
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/2654.4e4df7ef.chunk.css
@@ -0,0 +1 @@
+.avatarHolder{margin-bottom:16px;text-align:center;position:relative;display:inline-block;height:120px}.avatarHolder>img{width:120px;height:120px;margin-bottom:20px;border-radius:50%}.avatarHolder:hover:after{position:absolute;top:0;right:0;bottom:0;left:0;color:#eee;font-size:24px;font-style:normal;line-height:110px;background:#00000080;border-radius:50%;cursor:pointer;content:"+";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.teamTitle{margin-bottom:12px;color:#000000d9;font-weight:500}.team :global .ant-avatar{margin-right:12px}.team a{display:block;margin-bottom:24px;overflow:hidden;color:#000000d9;white-space:nowrap;text-overflow:ellipsis;word-break:break-all;transition:color .3s}.team a:hover{color:#1890ff}