Merge branch 'dev' into 'mp-server-test'

卡密导入模板生成

See merge request quanshu/mp-server!920

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -92,7 +92,6 @@ public class GoodsMgrController extends BaseApiController {
     @ApiOperation("下载卡密导入模板")
     public AjaxResult cardTemplateDownload(){
         ExcelUtil<GoodsCardImportExcel> excelUtil = new ExcelUtil<>(GoodsCardImportExcel.class);
-        excelUtil.exportExcel();
         return excelUtil.exportExcel(null, "卡密导入模板", false);
     }