From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index f9ad0ea..4019ca0 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -1,15 +1,14 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -92,8 +91,8 @@
@ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@@ -108,4 +107,7 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3