Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b

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

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

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

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