Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-03-08 ca982eb586579947e6fcfc0b6a2231b3c29fc91b

 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