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

 Conflicts:

	pom.xml

	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

	ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

	ruoyi-ui/package.json

	ruoyi-ui/src/components/Editor/index.vue

	ruoyi-ui/src/router/index.js

pom.xml

@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <mybatis.boot.version>1.3.2</mybatis.boot.version>
-        <druid.version>1.1.23</druid.version>
+        <druid.version>1.1.22</druid.version>
         <bitwalker.version>1.19</bitwalker.version>
         <swagger.version>2.9.2</swagger.version>
 		<kaptcha.version>2.3.2</kaptcha.version>
@@ -29,7 +29,7 @@
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <poi.version>3.17</poi.version>
         <velocity.version>1.7</velocity.version>
-        <jwt.version>0.9.0</jwt.version>
+        <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.3.0</mybatis-plus.version>
         <hutool.version>5.1.0</hutool.version>
     </properties>

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

@@ -503,7 +503,7 @@ public class ExcelUtil<T>
         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));
         }
     }
 

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;

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;
 

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectNoticeVo">
-        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
     </sql>
     

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",

ruoyi-ui/src/components/Editor/index.vue

@@ -114,7 +114,7 @@ export default {
 </script>
 
 <style>
-.editor {
+.editor, .ql-toolbar {
   white-space: pre-wrap!important;
   line-height: normal !important;
 }

ruoyi-ui/src/router/index.js

@@ -19,7 +19,7 @@ import Layout from '@/layout'
  * meta : {
     roles: ['admin','editor']    // 设置该路由进入的权限，支持多个权限叠加
     title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'             // 设置该路由的图标，对应路径src/icons/svg
+    icon: 'svg-name'             // 设置该路由的图标，对应路径src/assets/icons/svg
     breadcrumb: false            // 如果设置为false，则不会在breadcrumb面包屑中显示
   }
  */