Merge remote-tracking branch 'origin/master'

Tcsm

2023-09-25 7bee61be8fba5c23999dc9e826e6af9de98db469

 ruoyi-ui/src/views/login.vue

@@ -124,9 +124,9 @@
      </el-form-item>
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
      <span>Copyright © GDUT All Rights Reserved.</span>
      <a href="https://beian.miit.gov.cn/" target="_blank" >粤ICP备2023050334号 </a>
    <div class="el-login-footer" >
      <span style="color: black; ">Copyright © GDUT All Rights Reserved.<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></span>
      <a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">粤ICP备2023050334号<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>公安备案号44010402003045</a>
    </div>
  </div>
</template>
@@ -142,8 +142,10 @@
    return {
      codeUrl: "",
      loginForm: {
        username: "admin",
        password: "admin123",
        // username: "admin",
        // password: "admin123",
        username: "",
        password: "",
        rememberMe: false,
        code: "",
        uuid: ""