Merge branch 'api' into hive2.0

jyy

2021-01-25 b265b9fc41cd9de5bd36c76ec02578e1075de1d1

 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