Merge remote-tracking branch 'origin/master'

fei

5 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 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+配置方式


}