From fe39a7bc7bb45f73646aa944150f57129e480ac7 Mon Sep 17 00:00:00 2001
From: wangzhijun <wangazhi@sohu.com>
Date: Wed, 9 Dec 2020 16:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BFcontroller=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=EF=BC=9B=E6=A8=A1=E6=9D=BFvue=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E5=BD=93=E6=9C=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 1 +
 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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 26b74732..4c312c49 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -1,6 +1,7 @@
 package ${packageName}.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import java.util.List;
 import java.util.Arrays;
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index aa973b1d..114f09d0 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -323,7 +323,7 @@ export default {
         pageSize: 10,
 #foreach ($column in $columns)
 #if($column.query)
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
+        $column.javaField: undefined#if($velocityCount != $columns.size()),#end
 
 #end
 #end
@@ -399,7 +399,7 @@ export default {
         $column.javaField: []#if($velocityCount != $columns.size()),#end
 
 #else
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
+        $column.javaField: undefined#if($velocityCount != $columns.size()),#end
 
 #end
 #end