Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-10-31 c1a3eaaffb8d67ba90871d935d17f0a514426fe2

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java

@@ -23,6 +23,7 @@
public class XxlJobAdminConfig implements InitializingBean, DisposableBean {

    private static XxlJobAdminConfig adminConfig = null;

    public static XxlJobAdminConfig getAdminConfig() {
        return adminConfig;
    }