From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
index 048ec3a..9b437ee 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -47,6 +48,9 @@
@ApiModelProperty(value = "点位id")
@TableField("location_id")
private String locationId;
+ @ApiModelProperty(value = "距离 米")
+ @TableField(exist = false)
+ private BigDecimal distance;
@ApiModelProperty(value = "巡检员id 对应sys_user表")
@TableField("patrol_inspector")
@@ -56,6 +60,10 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("implement_time")
private LocalDateTime implementTime;
+
+ @ApiModelProperty(value = "执行日期前端传递")
+ @TableField(exist = false)
+ private String implementTime1;
@ApiModelProperty(value = "任务类型 1日常任务 2自建任务")
@TableField("task_type")
@@ -70,6 +78,13 @@
@ApiModelProperty(value = "任务编号")
@TableField("task_code")
private String taskCode;
-
-
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ @TableField("template_id")
+ private String templateId;
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ @TableField("user_id")
+ private Long userId;
+ @ApiModelProperty(value = "点位名称")
+ @TableField(exist = false)
+ private String locationName;
}
--
Gitblit v1.7.1