From 9a43baadaff836e43c510a0da0f0c770ea73af45 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 15:38:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect 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