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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

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

@@ -65,7 +65,7 @@
#定时任务
scheduling.enabled=false

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