Merge branch 'master' of http://192.168.1.220:10080/CoSharp/config

hos-broker.yml

@@ -15,6 +15,7 @@ camel:
    name: hos-broker
---
spring:
  profiles: dev
  activemq:
@@ -60,7 +61,9 @@ hos:
    password: ceshi
hzy:
  hello: hello dev !!!
  
---
spring:
  profiles: test
  activemq: