Merge branch 'master' into positec

king

2023-08-16 7e46c386be5c2cfc20af3936d26839ad3fce44b0

 src/views/login/index.jsx

@@ -930,7 +930,6 @@
        </div>
        <div className="login-middle" style={lineColor ? {borderColor: lineColor} : {}}>
          {loginWays ? <LoginForm
            platName={this.state.platName}
            dict={this.state.dict}
            auth={this.state.auth}
            authError={this.state.authError}