From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index c41d626..4e7efad 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -30,6 +30,10 @@
     @Excel(name = "宸℃浠诲姟鍚嶇О")
     private String taskName;
 
+    @Schema(description = "宸℃椤圭洰")
+    @Excel(name = "宸℃椤圭洰")
+    private String inspectionProject;
+
     @Schema(description = "璁惧id")
     private Integer taskId;
 
@@ -44,6 +48,22 @@
     @Excel(name = "澶囨敞")
     private String remarks;
 
+    @Schema(description = "宸℃缁撴灉 0 寮傚父 1 姝e父")
+    private String inspectionResult;
+
+    @Schema(description = "寮傚父鎻忚堪")
+    private String abnormalDescription;
+
+    @Schema(description = "鍏宠仈缁翠慨鍗旾D")
+    private Long deviceRepairId;
+
+    @Schema(description = "楠屾敹浜篒D")
+    private Long acceptanceUserId;
+
+    @Schema(description = "楠屾敹浜�")
+    @Excel(name = "楠屾敹浜�")
+    private String acceptanceName;
+
     @Schema(description = "浠诲姟鐧昏浜篒D")
     private Long registrantId;
 

--
Gitblit v1.9.3