Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-09-14 a7e6a3b52c64ba9add0ceb643d6915473a7770a4

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