From 2193f1e8240e2a0ed5900dddc6347a1d9db081cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 14:38:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
.idea/encodings.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 0956fda..0ce3556 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -9,5 +9,7 @@
<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" />
+ <file url="file://$PROJECT_DIR$/server/zhubo/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/server/zhubo/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.9.3