From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
index aff156a..551ddcd 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
@@ -53,7 +53,7 @@
* 下次跟进时间
*/
@TableField("next_follow_date")
- private Date nextFollowDate;
+ private String nextFollowDate;
/**
* 任务标题
*/
@@ -69,12 +69,17 @@
*/
@TableField("create_time")
private Date createTime;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Long createUserId;
/**
* 任务时间
*/
@TableField("task_date")
- private Date taskDate;
+ private String taskDate;
/**
* 任务状态0未开始1待处理2已处理3已过期
--
Gitblit v1.7.1