Merge branch 'dev' into pay_master

zhaoxiaohao

2020-09-29 0bad58cb6d46ec5c111d3adaee11337c5ccd5d9c

 kidgrow-config/src/main/resources/application-dev.properties

@@ -15,7 +15,7 @@
spring.redis.timeout=5000

#rabbitmq\u914D\u7F6E
kidgrow.rabbitmq.host=182.92.99.224
kidgrow.rabbitmq.host=192.168.2.240
kidgrow.rabbitmq.port=5672
kidgrow.rabbitmq.username=liuke
kidgrow.rabbitmq.password=kidgrow2020