Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-20 5f377d1f45b85fba841794a93e67b03622613479

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

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

swagger.enable=false
swagger.enable=true