From fe39a7bc7bb45f73646aa944150f57129e480ac7 Mon Sep 17 00:00:00 2001
From: wangzhijun <wangazhi@sohu.com>
Date: 星期三, 09 十二月 2020 16:16:53 +0800
Subject: [PATCH] 模板controller导入；模板vue列表页当有查询条件时报错
---
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 26b7473..4c312c4 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 aa973b1..114f09d 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 @@
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 @@
$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
--
Gitblit v1.9.3