Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/InspectionItemPlanConclusionController.java

@@ -99,6 +99,7 @@ public class InspectionItemPlanConclusionController extends BaseController {
             cellRangeAddressList.addCellRangeAddress(1, 4, 1, 5);
             cellRangeAddressList.addCellRangeAddress(1, 7, 1, 8);
             cellRangeAddressList.addCellRangeAddress(2, 1, 2, 2);
+            cellRangeAddressList.addCellRangeAddress(2, 3, 2, 8);
             cellRangeAddressList.addCellRangeAddress(3, 0, 3, 15);
             cellRangeAddressList.addCellRangeAddress(4, 0, 5, 0);
             cellRangeAddressList.addCellRangeAddress(4, 1, 4, 5);
@@ -110,7 +111,7 @@ public class InspectionItemPlanConclusionController extends BaseController {
             }
 
             response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=inspectionItemPlanConclusion-" + DateUtil.getDate(new Date()) + ".xls");
+            response.setHeader("Content-Disposition", "attachment;filename=conclusion-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
             workbook.write(outputStream);