Merge branch 'hive2.0' into score_shop

Helius

2021-04-06 1037ab6df799bd49c0f10adf1c048cd5ccc7e3e8

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

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

swagger.enable=false
swagger.enable=true