From 61067dca4307bc3ebb28f50ce6de53c87c76160a Mon Sep 17 00:00:00 2001
From: An Yong Shuai <1539893812@qq.com>
Date: Wed, 19 Jun 2024 18:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8B=87=E5=B8=85=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/shelf/_2024_6_19_6_50____.xml                |  4 ++++
 .../shelved.patch                                  | 13 +++++++++++++
 .../shelved.patch                                  |  0
 .idea/workspace.xml                                | 14 ++++++++++++--
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 .idea/shelf/_2024_6_19_6_50____.xml
 create mode 100644 .idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch
 create mode 100644 .idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch

diff --git a/.idea/shelf/_2024_6_19_6_50____.xml b/.idea/shelf/_2024_6_19_6_50____.xml
new file mode 100644
index 0000000..002af6b
--- /dev/null
+++ b/.idea/shelf/_2024_6_19_6_50____.xml
@@ -0,0 +1,4 @@
+<changelist name="在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]" date="1718794249139" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch" />
+  <option name="DESCRIPTION" value="在进行签出之前于 2024/6/19 下午6:50 取消提交了更改 [更改]" />
+</changelist>
\ No newline at end of file
diff --git a/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch b/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch
new file mode 100644
index 0000000..f447a7e
--- /dev/null
+++ b/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch
@@ -0,0 +1,13 @@
+Index: etl-common/src/main/java/com/etl/common/util/Test.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>package com.etl.common.util;\r\n\r\npublic class Test {\r\n\r\n}\r\n
+===================================================================
+diff --git a/etl-common/src/main/java/com/etl/common/util/Test.java b/etl-common/src/main/java/com/etl/common/util/Test.java
+--- a/etl-common/src/main/java/com/etl/common/util/Test.java	
++++ b/etl-common/src/main/java/com/etl/common/util/Test.java	
+@@ -3,3 +3,4 @@
+ public class Test {
+ 
+ }
++
diff --git a/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch b/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 43d5b7f..64d5f76 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,21 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="" />
+    <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]/shelved.patch" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2024_6_19_下午6_50_取消提交了更改_[更改]1/shelved.patch" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="ays" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="MarkdownSettingsMigration">
@@ -19,7 +27,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="$PROJECT_DIR$/../../maven/apache-maven-3.6.3" />
+        <option name="customMavenHome" value="$PROJECT_DIR$/../../maven/apache-maven-3.6.3" />
+        <option name="mavenHomeTypeForPersistence" value="CUSTOM" />
         <option name="userSettingsFile" value="D:\maven\apache-maven-3.6.3\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
@@ -42,6 +51,7 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "ays",
     "last_opened_file_path": "D:/workspace/etl-cloud",
     "nodejs_package_manager_path": "npm",
     "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",