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

jyy

2021-04-20 d85af61932a03bd03663daf9da33177af5824a5c

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

@@ -41,7 +41,6 @@
rabbitmq.port=5672
rabbitmq.username=ct_rabbit
rabbitmq.password=123456
useRabbit=false

server.session.timeout=120