From 436aad0f4024418b8da241fead0d4470c918c63f Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Thu, 30 Apr 2020 15:18:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Excel=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2e38329fe8b75b332bda0ce977586a37e069c9d1
---
 .../modules/SpringBoot/java/frame/excel/WExcel.java  |  4 ++--
 .../SpringBoot/resources/templates/screen/index.ftl  | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
index 36460381..026a62bc 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
@@ -116,7 +116,7 @@ public class WExcel<T> implements Serializable, Cloneable {
     }
 
     /**
-     * 根据模板类对DataTable添加相应的列。
+     * 根据模板类对添加相应的列。
      *
      * @return WColumn集合
      */
@@ -471,7 +471,7 @@ public class WExcel<T> implements Serializable, Cloneable {
     }
 
     /**
-     * 判断DataTable是否包含错误信息
+     * 判断是否包含错误信息
      *
      * @return 是否包含错误.
      */
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
index 66631d55..922d1787 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
@@ -33,11 +33,19 @@
             <el-submenu index="${tool.uuid()}" >
                 <template slot="title">
                     <i class="el-icon-setting"></i>
-                    <span slot="title">系统设置</span>
+                    <span slot="title">基本设置</span>
                 </template>
+                <el-submenu index="${tool.uuid()}" >
+                    <template slot="title">
+                        <i class="el-icon-help"></i>
+                        <span slot="title">角色</span>
+                    </template>
+                    <el-menu-item index="${tool.uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/system/res.htm'})">资源管理</el-menu-item>
+                    <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'LOG_ERR', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
+                    <el-menu-item index="${tool.uuid()}" @click="addTab({title: '计划调度', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">计划调度</el-menu-item>
+                </el-submenu>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '字典管理', name: 'dict', url: '${r'${context}'}/system/dict.htm'})">字典管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/system/file.htm'})">文件管理</el-menu-item>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/system/res.htm'})">资源管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '用户管理', name: 'user', url: '${r'${context}'}/system/user.htm'})">用户管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '部门管理', name: 'dept', url: '${r'${context}'}/system/dept.htm'})">部门管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '角色管理', name: 'role', url: '${r'${context}'}/system/role.htm'})">角色管理</el-menu-item>