Merge branch 'api' into hive2.0

jyy

2021-03-08 acc6c0773bc959be6aa8cf6b9e767593a2d066f4

 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