Merge branch 'api' into hive2.0

jyy

2021-03-08 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37

 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

@@ -57,4 +56,4 @@
#定时任务
scheduling.enabled=true

swagger.enable=false
swagger.enable=true