Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2020-04-29 42008124b68bfd7f2e2003c07bc0bdd5311f95b6

 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