Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-10 b348b766fc4cd9079d1bee1fed32fc21bfe01436

 ruoyi-ui/src/assets/styles/sidebar.scss

@@ -135,9 +135,6 @@
          margin-left: 20px;
        }

        .el-submenu__icon-arrow {
          display: none;
        }
      }
    }