冲突解决

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);