Merge remote-tracking branch 'origin/master'

doum

2025-09-03 e352367d6d5b8441327f6a3ab1ae500ff1425265

 .idea/encodings.xml

@@ -5,6 +5,9 @@
    <file url="file://$PROJECT_DIR$/server/services/src/main/java" 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/untitled/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/server/untitled/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/server/web/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/../../../maven/repository/org/springframework/boot/spring-boot-starter-parent/2.2.5.RELEASE/src/main/resources" charset="UTF-8" />
  </component>
</project>