解决冲突

jiangping

2023-09-14 31c9104b7e4f963110ee581ac05a3a5addc109f5

1
2
3
4
5
6
7
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Encoding">
    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
  </component>
</project>