merge master

zhangzengfei

2021-07-07 0b737708e696c45720499759b5c31aced87fdbb6

 public/index.html

@@ -367,9 +367,9 @@
      cursor: pointer;
    }

    /* .flex-box{
    .flex-box{
      display: flex;
    } */
    }
    .el-button--primary {
      color: #FFFFFF;
      background-color: #3D68E1 !important;