From 8ee88e8c511b75f2b2e566c37b38209a0c35afa8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 11 九月 2023 16:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
.idea/encodings.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 2c23a59..0956fda 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
+ <file url="file://$PROJECT_DIR$/server/company/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/company/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/platform/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/platform/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/service/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/service/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" />
</component>
--
Gitblit v1.9.3