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

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

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

@@ -59,7 +59,7 @@
#定时任务
scheduling.enabled=false

swagger.enable=false
swagger.enable=true
swagger.security.username=admin
swagger.security.password=admin