Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-29 02fecd88de1beaf80de66e07a0568da471dfd751

 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