解决冲突

jiangping

2023-09-14 0ebb006ea17307cbd9d681f45467f8f49715a5fb

 .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>