From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +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 | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 ed9f855..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
@@ -1,15 +1,15 @@
package com.ruoyi.shop.domain.pojo.task;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -40,10 +40,10 @@
@TableField("shop_id")
private Long shopId;
/**
- * 跟进类型id
+ * 跟进类型
*/
- @TableField("follow_type_id")
- private Long followTypeId;
+ @TableField("follow_type")
+ private String followType;
/**
* 跟进内容
*/
@@ -53,23 +53,39 @@
* 下次跟进时间
*/
@TableField("next_follow_date")
- private Date nextFollowDate;
+ private String nextFollowDate;
/**
* 任务标题
*/
@TableField("task_title")
private String taskTitle;
/**
- * 紧急情况id
+ * 紧急情况
*/
- @TableField("emergency_state_id")
- private Long emergencyStateId;
+ @TableField("emergency_state")
+ private String emergencyState;
/**
* 创建时间
*/
@TableField("create_time")
private Date createTime;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Long createUserId;
+ /**
+ * 任务时间
+ */
+ @TableField("task_date")
+ private String taskDate;
+
+ /**
+ * 任务状态0未开始1待处理2已处理3已过期
+ */
+ @TableField("task_status")
+ private Integer taskStatus;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1