Merge remote-tracking branch 'origin/main'

# Conflicts: # .idea/compiler.xml # .idea/encodings.xml # .idea/misc.xml # .idea/modules.xml
2 years ago · 573f4b44e6
parent 68a8713d33 55e46b91ad
commit 573f4b44e6
6 changed files with 11 additions and 7 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -9,9 +9,6 @@
        <module name="springboot" />
      </profile>
    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="springboot" target="1.8" />
-    </bytecodeTargetLevel>
  </component>
  <component name="JavacSettings">
    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@ -2,6 +2,5 @@
 <project version="4">
  <component name="Encoding">
    <file url="file://$PROJECT_DIR$/student/springboot/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/student/springboot/src/main/resources" charset="UTF-8" />
  </component>
 </project>
--- 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/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="MavenProjectsManager">
    <option name="originalFiles">
      <list>
@ -7,5 +8,7 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -3,7 +3,6 @@
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/1111.iml" filepath="$PROJECT_DIR$/.idea/1111.iml" />
-      <module fileurl="file://$PROJECT_DIR$/student/springboot/springboot.iml" filepath="$PROJECT_DIR$/student/springboot/springboot.iml" />
    </modules>
  </component>
 </project>
--- 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>