Merge remote-tracking branch 'origin/master'

zhs

15 小时以前 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

 .idea/jarRepositories.xml

@@ -49,12 +49,12 @@
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="central" />
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
      <option name="url" value="http://repo2.maven.org/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="central" />
      <option name="url" value="http://repo2.maven.org/maven2/" />
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jcenter" />
@@ -97,4 +97,4 @@
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
  </component>
</project>
</project>