From 6751b97db9a892cdc91288e1a90dabfa3870b52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 25 Feb 2022 18:34:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/java/serviceImpl.java.vm        | 8 ++++----
 .../src/main/resources/vm/vue/index-tree.vue.vm           | 2 +-
 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 83a8f4272..005c84a9f 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 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 查询${functionName}列表
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return ${functionName}
      */
     @Override
@@ -62,7 +62,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 查询${functionName}列表
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return ${functionName}
      */
     @Override
@@ -101,7 +101,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 新增${functionName}
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return 结果
      */
     @Override
@@ -119,7 +119,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 修改${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 37928941d..14c4a14c0 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 @@ export default {
       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 5c1f85a6f..1b6f39de6 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>
                 权限字符