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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

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

@@ -4,9 +4,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;


/**
 * 启动程序