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

935090232@qq.com

2021-07-29 bf60845c8da9d0099ef25c8e6703351055865a8e

 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