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

疯狂的狮子li

2022-04-24 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d

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


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java

	ruoyi-ui/package.json

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -14,6 +14,7 @@
import lombok.experimental.Accessors;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

/**
@@ -53,6 +54,7 @@
    @ExcelProperty(value = "字典类型")
    @NotBlank(message = "字典类型不能为空")
    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
    private String dictType;

    /**

 ruoyi-ui/package.json

@@ -41,7 +41,7 @@
    "clipboard": "2.0.8",
    "core-js": "3.19.1",
    "echarts": "4.9.0",
    "element-ui": "2.15.6",
    "element-ui": "2.15.8",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",
    "highlight.js": "9.18.5",