Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

 screen-job/src/main/resources/application-dev.yml

@@ -81,6 +81,7 @@

logging:
  config: classpath:logback.xml

xxl:
  job:
    admin: