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

疯狂的狮子li

2021-09-14 662251e208e58a9940efb200457c49ed342cd06f

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

@@ -2,15 +2,14 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

/**
 * 启动程序
 * 
 *
 * @author ruoyi
 */

@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@SpringBootApplication
public class RuoYiApplication
{
    public static void main(String[] args)