Merge branch 'score_shop' into api_score_meger

Helius

2021-04-21 4cab5d1219c7ea01e60a0629bf0e9e062be029d1

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

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

swagger.enable=false
swagger.enable=true