From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
index 01281c3..c8f2cb8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
@@ -4,7 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * @author jqs34
@@ -16,7 +16,7 @@
 @Data
 public class MerFollowMemberTaskDto extends MerBaseDto {
 
-    @ApiModelProperty(name = "任务id")
+    @ApiModelProperty(value = "任务id")
     private String taskId;
 
     @ApiModelProperty("跟踪类型1电话2手动")
@@ -25,10 +25,10 @@
     @ApiModelProperty("拨打电话")
     private String callPhone;
 
-    @ApiModelProperty("电话时间")
-    private Date callTime;
+    @ApiModelProperty("电话跟踪内容")
+    private List<MerFollowPhoneDto> followPhone;
 
-    @ApiModelProperty("跟踪内容")
+    @ApiModelProperty("手动跟踪内容")
     private String followContent;
 
     @ApiModelProperty("跟进图片地址 多个,号隔开")
@@ -41,7 +41,7 @@
     private String audio;
 
     @ApiModelProperty("下次任务时间")
-    private Date nextTaskDate;
+    private String nextTaskDate;
 
     @ApiModelProperty("下次任务内容")
     private String nextTaskContent;

--
Gitblit v1.7.1