From ead1fc208b29ff9474a2dd5e536279daabc2bbf3 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Fri, 25 Apr 2025 21:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/task/controller/PatrolTaskController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 46b6512..1ecc89d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -2466,15 +2466,9 @@ public class PatrolTaskController extends BaseController { Cell cell10 = row.createCell(10); cell10.setCellValue(MessageUtils.get("分析图片")); Cell cell11 = row.createCell(11); -<<<<<<< Updated upstream cell11.setCellValue(MessageUtils.get("分析结果")); HSSFPatriarch patriarch = (HSSFPatriarch)sheet.createDrawingPatriarch(); for(int i = 0; i < newList.size(); ++i) { -======= - cell11.setCellValue("分析结果"); - HSSFPatriarch patriarch = (HSSFPatriarch) sheet.createDrawingPatriarch(); - for (int i = 0; i < newList.size(); ++i) { ->>>>>>> Stashed changes Row row1 = sheet.createRow(i + 1); Cell cell12 = row1.createCell(0); cell12.setCellValue(i + 1);