Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 7c92603d6548e7405a298d3c4996942acd999376

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

@@ -56,4 +56,4 @@
#定时任务
scheduling.enabled=true

swagger.enable=false
swagger.enable=true