From d8208e23a088e6f7898fba609d70ee6d41b308da Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 23 八月 2024 10:12:41 +0800
Subject: [PATCH] Merge branch 'master-jiayan' into master-jiayan-test
---
.idea/misc.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e8942bd..d5cd614 100644
--- 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,7 +8,5 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
--
Gitblit v1.8.0