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

zss

9 天以前 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 src/main/java/com/ruoyi/common/constant/Constants.java

@@ -168,6 +168,6 @@
    /**

     * 定时任务违规的字符

     */

    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",

    public static final String[] JOB_ERROR_STR = { "java.net.URL", "jakarta.naming.InitialContext", "org.yaml.snakeyaml",

            "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.framework.config", "com.ruoyi.project.tool" };

}