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

jyy

2021-03-15 a6390619c7ce74611659ba091047f9278a8404a9

 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