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

# Conflicts: # src/sysConfig/index.js
2021-06-04 18:02:14 +08:00
parent 7cc0300099 af2a58433d
commit de57b8d2ae
8 changed files with 37 additions and 22 deletions
@@ -297,6 +297,7 @@ export default {
  }
  .effect {
    margin-left: 10px;
+    margin-bottom: 10px;
  }
  .container {
    height: calc(~'100% - 52px - 55px - 50px');