From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 dca888f..d2cbef4 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;
/**
* 任务标题
*/
@@ -74,9 +74,13 @@
* 任务时间
*/
@TableField("task_date")
- private Date taskDate;
+ private String taskDate;
-
+ /**
+ * 任务状态0未开始1待处理2已处理3已过期
+ */
+ @TableField("task_status")
+ private Integer taskStatus;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1