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

xiaoyong931011

2021-03-12 6d47ae98e2cc860299bfb976bec226d99a0bcd1b

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

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

swagger.enable=false
swagger.enable=true