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 26b747321ec42ad60c8ab93a795dd5a9b2351b5a..4c312c49e5f9c20adc8dc24b098b7936167aaa92 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 aa973b1df92c726bd2bf71cceb47971a8959fb50..114f09d093137a52ed860563c936c4a9cb889c25 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