Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/views/login/index.scss

@@ -22,6 +22,7 @@
      font-weight: 600;
      padding-left: 20px;
      font-family: "黑体","宋体",sans-serif,"Arial","Microsoft YaHei";
      z-index: 1;
    }
  }

@@ -99,7 +100,7 @@
      min-width: 300px;
      border-radius: 5px;
      overflow: hidden;
      border: 1px solid #e8e8e8;
      border: 1px solid #bfbfbf;

      .form-item-wrap {
        padding: 0.6vw 1.6vw 1.6vw;