Merge branch 'api' into hive2.0

jyy

2021-03-08 aaaf4564b44adf5b9a47843b27fbd68ea56c9a52

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

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

swagger.enable=false
swagger.enable=true