From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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..0234bf7 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,34 +16,41 @@
@Data
public class MerFollowMemberTaskDto extends MerBaseDto {
- @ApiModelProperty(name = "任务id")
+ @ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty("跟踪类型1电话2手动")
+ @ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
- @ApiModelProperty("拨打电话")
+ @ApiModelProperty(value="自定义跟进类型")
+ private String customeFollowType;
+
+
+ @ApiModelProperty(value="拨打电话")
private String callPhone;
- @ApiModelProperty("电话时间")
- private Date callTime;
+ @ApiModelProperty(value="电话跟踪内容")
+ private List<MerFollowPhoneDto> followPhone;
- @ApiModelProperty("跟踪内容")
+ @ApiModelProperty(value="手动跟踪内容")
private String followContent;
- @ApiModelProperty("跟进图片地址 多个,号隔开")
+ @ApiModelProperty(value="跟进图片地址 多个,号隔开")
private String picture;
- @ApiModelProperty("跟进视频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进视频地址 多个,号隔开")
private String video;
- @ApiModelProperty("跟进音频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进音频地址 多个,号隔开")
private String audio;
- @ApiModelProperty("下次任务时间")
- private Date nextTaskDate;
+ @ApiModelProperty(value="下次任务时间")
+ private String nextTaskDate;
- @ApiModelProperty("下次任务内容")
+ @ApiModelProperty(value="下次任务紧急情况")
+ private String emergencyState;;
+
+ @ApiModelProperty(value="下次任务内容")
private String nextTaskContent;
--
Gitblit v1.7.1