Merge remote-tracking branch 'origin/master'

feige

2024-06-11 8a7e33332203a2e1334ba55a4838b6b1060d406c

 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -15,4 +15,7 @@
    public static void main(String[] args) {
        SpringApplication.run(RuoYiApplication.class, args);
    }
    //SpringBoot-v2.0+配置方式


}