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

935090232@qq.com

2021-01-06 33d82cdff305ce4cb784638edc258b7bb8397353

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

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

swagger.enable=false
swagger.enable=true