Merge remote-tracking branch 'origin/master'

liusheng

10 天以前 274d8e2950e79e73b14783e497cdaf97f7dbb8d3

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>