Merge branch 'score_shop' into api_score_meger

Helius

2021-09-08 9037526ae431ecf9924c000f122e52e98f72d46e

 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