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

疯狂的狮子li

2021-04-14 f093da99ecb963d19d62dc0f242f00b20bc8895c

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

@@ -74,7 +74,7 @@
    public AjaxResult<${ClassName}Vo> export(${ClassName}QueryBo bo) {
        List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
        ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
        return util.exportExcel(list, "${businessName}" );
        return util.exportExcel(list, "${businessName}数据" );
    }

    /**