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

jyy

2021-01-19 236fe234fac0fb33b1caa24ed80d74d47a2cc68e

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

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

swagger.enable=false
swagger.enable=true