wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改 生成器controller模板缺导包 与 index页面兼容性 

Merge pull request !2 from dragonwzj/master
This commit is contained in:
疯狂的狮子li 2020-12-09 16:49:24 +08:00 committed by Gitee
parent 5109eb0e7e fe39a7bc7b
commit 4e56f30381
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@ -1,6 +1,7 @@
package ${packageName}.controller; package ${packageName}.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.util.List; import java.util.List;
import java.util.Arrays; import java.util.Arrays;

4
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -323,7 +323,7 @@ export default {
pageSize: 10, pageSize: 10,
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query) #if($column.query)
$column.javaField: null#if($velocityCount != $columns.size()),#end $column.javaField: undefined#if($velocityCount != $columns.size()),#end
#end #end
#end #end
@ -399,7 +399,7 @@ export default {
$column.javaField: []#if($velocityCount != $columns.size()),#end $column.javaField: []#if($velocityCount != $columns.size()),#end
#else #else
$column.javaField: null#if($velocityCount != $columns.size()),#end $column.javaField: undefined#if($velocityCount != $columns.size()),#end
#end #end
#end #end