Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-01 5f866906d1d14b2b3f2123a49270458c12fecf7e

 ruoyi/src/main/resources/vm/java/controller.java.vm

@@ -137,9 +137,8 @@
        return getDataTable(list);
    }
#elseif($table.tree)
    public AjaxResult list(${ClassName} ${className})
    {
        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
    public AjaxResult list(${ClassName} ${className}) {
        List<${ClassName}> list = i${ClassName}Service.list(lqw);
        return AjaxResult.success(list);
    }
#end