Merge remote-tracking branch 'origin/master'

liusheng

11 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

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>