Merge branch 'dev' into 'master'

dev - master 15

See merge request !338

quality-review/src/main/java/com/ruoyi/web/ReviewEnterpriseArchiveController.java

@@ -107,11 +107,11 @@ public class ReviewEnterpriseArchiveController extends BaseController {
 
     @ApiOperation("车企文件导入模板下载")
     @RequestMapping(method = RequestMethod.POST, value = "/importDownload")
-    public R<String> EnterpriseFileDownload(HttpServletResponse response) throws Exception {
+    public void EnterpriseFileDownload(HttpServletResponse response) throws Exception {
         ExcelUtil<EnterpriseImportFileVO> util = new ExcelUtil<>(EnterpriseImportFileVO.class);
         ExcelUtil.setCombo(EnterpriseImportFileVO.class, "status",
                 Lists.newArrayList("现行有效", "已失效"));
-        return R.ok();
+        util.importTemplateExcel(response, "车企文件导入模板");
     }
 
     @ApiOperation("车企文件导入")