diff --git a/pom.xml b/pom.xml
index db5536cf..de0bc2d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
UTF-8
1.8
1.3.2
- 1.1.23
+ 1.1.22
1.19
2.9.2
2.3.2
@@ -29,7 +29,7 @@
1.3.3
3.17
1.7
- 0.9.0
+ 0.9.1
3.3.0
5.1.0
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 4e93c6cf..43e52daf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -503,7 +503,7 @@ public class ExcelUtil
else if (ColumnType.NUMERIC == attr.cellType())
{
cell.setCellType(CellType.NUMERIC);
- cell.setCellValue(Integer.parseInt(value + ""));
+ cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
}
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 8e0048be..e9b80711 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -88,7 +88,7 @@ public class SysJob extends BaseEntity implements Serializable
}
@NotBlank(message = "调用目标字符串不能为空")
- @Size(min = 0, max = 1000, message = "调用目标字符串长度不能超过500个字符")
+ @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
public String getInvokeTarget()
{
return invokeTarget;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 3cbb1413..b26c9222 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -13,7 +13,7 @@ public class MetaVo
private String title;
/**
- * 设置该路由的图标,对应路径src/icons/svg
+ * 设置该路由的图标,对应路径src/assets/icons/svg
*/
private String icon;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index f9d156b2..c51dabe7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark
+ select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
from sys_notice
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index f0336da4..a71e194f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -58,7 +58,7 @@
"sortablejs": "1.8.4",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
- "vue-quill-editor": "3.0.6",
+ "quill": "1.3.7",
"vue-cropper": "0.4.9",
"vue-router": "3.0.2",
"vue-splitpane": "1.0.4",
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 27088005..77c3062f 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -114,7 +114,7 @@ export default {