From 8676f4cb37ef31fa9fcfe2a7faf5f4c4ea77cc1a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 29 一月 2026 09:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
.idea/encodings.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 41a5905..88225b8 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,12 +2,12 @@
<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/admin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/server/services/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/services/src/main/resources" 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" />
+ <file url="file://$PROJECT_DIR$/server/web/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.9.3