From 75ac3d5acdd448f063a3c307b4c733e37b4fc04f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/.idea/encodings.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/server/.idea/encodings.xml b/server/.idea/encodings.xml
index aa00ffa..0e2eab3 100644
--- a/server/.idea/encodings.xml
+++ b/server/.idea/encodings.xml
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
+ <file url="file://$PROJECT_DIR$/company/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/company/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/platform/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/platform/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/zhubo/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/zhubo/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.9.3