From 8a5ac1e030826485463c078cdde03a065b45a960 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 五月 2026 14:27:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 2d8722e..43a3edc 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -33,6 +33,10 @@
@Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
+ @Schema(description = "宸℃椤圭洰")
+ @Excel(name = "宸℃椤圭洰")
+ private String inspectionProject;
+
@Schema(description = "璁惧id")
private Integer taskId;
@@ -60,6 +64,10 @@
@Schema(description = "鏄惁婵�娲�")
private boolean isActive;
+ @Schema(description = "鏄惁鍚敤 0鍚� 1鏄�")
+ @Excel(name = "鏄惁鍚敤", readConverterExp = "0=鍚�,1=鏄�")
+ private Integer isEnabled;
+
@Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remarks;
--
Gitblit v1.9.3