Merge remote-tracking branch 'origin/master'

liusheng

5 天以前 42fb200e5c378ab7090e3aa4627faee8912eb67d

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>