From a377521310f5f9a39b71e7c7ce4623d5a13ea185 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 03 九月 2025 17:18:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

---
 .idea/encodings.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 2c23a59..41a5905 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/server/admin/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/services/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/server/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/untitled/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/untitled/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/server/web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../../../maven/repository/org/springframework/boot/spring-boot-starter-parent/2.2.5.RELEASE/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file

--
Gitblit v1.9.3