Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

 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