Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

Helius

2021-03-01 e1351f8d82bea927c3a4fb31e5d9b4193957b3e6

 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