Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b

 zq-erp/src/main/resources/config/prd/application.properties

@@ -42,7 +42,7 @@


#rabbitMQ配置
rabbitmq.host=127.0.0.1
rabbitmq.host=47.111.134.136
rabbitmq.port=5672
rabbitmq.username=hivequeue
rabbitmq.password=hivequeueadmin