Merge branch 'score_shop' into api_score_meger

jyy

2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783

 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