Merge branch 'master' of http://192.168.1.220:10080/esb/esb

.idea/libraries/Maven__jline_jline_0_9_94.xml

@@ -0,0 +1,13 @@
<component name="libraryTable">
  <library name="Maven: jline:jline:0.9.94">
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-sources.jar!/" />
    </SOURCES>
  </library>
</component>

Hos-Resource-Rest/resource-rest.iml

@@ -105,5 +105,6 @@
    <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.16.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.1.2" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.0.0" level="project" />
  </component>
</module>