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

935090232@qq.com

2021-01-31 0764ab507f1b21fb8eadd7bc294ebf28aa592c24

 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