diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index c53260513..1f9461fbe 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -66,7 +66,7 @@ public class ${ClassName}Controller extends BaseController { List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - return util.exportExcel(list, "${functionName}"); + return util.exportExcel(list, "${functionName}数据"); } /** diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index 239762834..31d06e256 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -47,7 +47,7 @@ export default { topMenus() { let topMenus = []; this.routers.map((menu) => { - if (menu.hidden === false) { + if (menu.hidden !== true) { topMenus.push(menu); } });