Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-12 2502f378fc7833f3f8225b9a98bcd2cca9111f91

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

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

swagger.enable=false
swagger.enable=true