From 15025b4fc820551fccc1b3bb73bd72dcec729941 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Tue, 30 Jan 2024 16:09:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java  | 13 +++++++++++++
 .../com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java
index 422460a0..cef1bbd3 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java
@@ -1,7 +1,10 @@
 package com.kms.yxgh.df.dto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -110,5 +113,15 @@ public class DfAnimalPlanSimpleDto {
     @ApiModelProperty("最近修改人")
     private String updateUid;
 
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    /**
+     * 最近修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("最近修改时间")
+    private Date updateTime;
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java
index 0ecfda18..63095b91 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java
@@ -23,7 +23,7 @@ public interface DfAnimalPlanMapper extends BaseMapper<DfAnimalPlan> {
     @Select("<script>" +
             "SELECT p.id, p.dike_code AS dikeCode, j.dike_name AS dikeName, p.name, p.type, j.dike_grad AS dikeGrad, j.dike_type AS dikeType, " +
             "p.instruction, p.month, p.frequency, p.cycle_type AS cycleType, p.is_reminder AS isReminder, p.reminder_time AS reminderTime, " +
-            "p.other_config AS otherConfig, p.create_uid AS createUid, p.update_uid AS updateUid " +
+            "p.other_config AS otherConfig, p.create_uid AS createUid, p.update_uid AS updateUid, p.create_time as createTime,p.update_time as updateTime " +
             "FROM bs_sgc_df_hdjh p " +
             "LEFT JOIN bs_sgc_df_jbxx j ON p.dike_code = j.dike_code " +
             "WHERE 1=1 " +