public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-04-12 21:43:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
This commit is contained in:
疯狂的狮子Li
2026-03-06 11:04:56 +08:00
parent 39781fbe7f ab201f9d9e
commit 5642159803
12 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java
View File

@@ -21,6 +21,7 @@ import java.util.stream.IntStream;
*
* @author 老马
*/
@SuppressWarnings({"unchecked", "rawtypes"})
@Component
@JobExecutor(name = "testMapJobAnnotation")
public class TestMapJobAnnotation {

1
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java
View File

@@ -23,6 +23,7 @@ import java.util.stream.IntStream;
*
* @author 老马
*/
@SuppressWarnings({"unchecked", "rawtypes"})
@Component
@JobExecutor(name = "testMapReduceAnnotation1")
public class TestMapReduceAnnotation1 {