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

xiaoyong931011

2021-04-07 beb6e85c9b054e8edced241c3367814a0a19d70c

 zq-erp/src/main/resources/config/application.properties

@@ -1,4 +1,4 @@
evn=jyy
evn=dev
server.port=8080


@@ -55,7 +55,7 @@
groupBuy.pay.timeLimit=30

#定时任务
scheduling.enabled=false
scheduling.enabled=true

swagger.enable=true
swagger.security.username=admin