Merge remote-tracking branch 'origin/main'

# Conflicts: # .idea/compiler.xml # .idea/encodings.xml # .idea/jarRepositories.xml # .idea/misc.xml # .idea/modules.xml
2 years ago · ac5144e9f6
parent 3e1b6df5ee 55e46b91ad
commit ac5144e9f6
2 changed files with 7 additions and 1 deletions
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
--- a/student/vue/index.html
+++ b/student/vue/index.html
@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>学生成绩管理系统111112222222</title>
+    <title>学生成绩管理系统111112222222333333333333</title>
  </head>
  <body>
    <div id="app"></div>