Merge branch 'master' into 重构/1078

# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java # src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
parent 0c29c90d3b ec9a0bcc76
commit 1420fcfcd0
24 changed files with 1404 additions and 245 deletions
--- a/web/src/styles/variables.scss
+++ b/web/src/styles/variables.scss
@@ -1,9 +1,9 @@
 // sidebar
 $menuText:#bfcbd9;
 $menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText: #f4f4f5; //https://github.com/ElemeFE/element/issues/12951

-$menuBg:#304156;
+$menuBg: #304156;
 $menuHover:#263445;

 $subMenuBg:#1f2d3d;