Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-16 b671918bc69a0cc7db13b8fae2759775bb8ca074

 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