From 6751b97db9a892cdc91288e1a90dabfa3870b52f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 25 二月 2022 18:34:37 +0800
Subject: [PATCH] fix 修复一些小问题
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 2 +-
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 8 ++++----
ruoyi-ui/src/views/system/menu/index.vue | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 83a8f42..005c84a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -48,7 +48,7 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*
- * @param ${className} ${functionName}
+ * @param bo ${functionName}
* @return ${functionName}
*/
@Override
@@ -62,7 +62,7 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*
- * @param ${className} ${functionName}
+ * @param bo ${functionName}
* @return ${functionName}
*/
@Override
@@ -101,7 +101,7 @@
/**
* 鏂板${functionName}
*
- * @param ${className} ${functionName}
+ * @param bo ${functionName}
* @return 缁撴灉
*/
@Override
@@ -119,7 +119,7 @@
/**
* 淇敼${functionName}
*
- * @param ${className} ${functionName}
+ * @param bo ${functionName}
* @return 缁撴灉
*/
@Override
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 3792894..14c4a14 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -306,7 +306,7 @@
queryParams: {
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
+ $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
},
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 5c1f85a..1b6f39d 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -78,7 +78,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
+ <el-button
size="mini"
type="text"
icon="el-icon-edit"
@@ -199,7 +199,7 @@
<el-form-item>
<el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" />
<span slot="label">
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+ <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@SaCheckPermission('system:user:list')" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
鏉冮檺瀛楃
--
Gitblit v1.9.3