Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2021-10-25 42a3117e2ac087f5c2c28ca07a1c4443e2c38ca3

 ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java

@@ -15,7 +15,7 @@
@AllArgsConstructor
public enum ThreadPoolRejectedPolicy {

    CALLER_RUNS_POLICY("等待", ThreadPoolExecutor.CallerRunsPolicy.class),
    CALLER_RUNS_POLICY("调用方执行", ThreadPoolExecutor.CallerRunsPolicy.class),
    DISCARD_OLDEST_POLICY("放弃最旧的", ThreadPoolExecutor.DiscardOldestPolicy.class),
    DISCARD_POLICY("丢弃", ThreadPoolExecutor.DiscardPolicy.class),
    ABORT_POLICY("中止", ThreadPoolExecutor.AbortPolicy.class);