From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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..405659b 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
@@ -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,17 +53,17 @@
      * 下次跟进时间
      */
     @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;
     /**
      * 创建时间
      */

--
Gitblit v1.7.1