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/dto/MerFollowMemberTaskDto.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 c8f2cb8..fd27689 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
@@ -19,31 +19,35 @@
@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("电话跟踪内容")
+ @ApiModelProperty(value="电话跟踪内容")
private List<MerFollowPhoneDto> followPhone;
- @ApiModelProperty("手动跟踪内容")
+ @ApiModelProperty(value="手动跟踪内容")
private String followContent;
- @ApiModelProperty("跟进图片地址 多个,号隔开")
- private String picture;
+ @ApiModelProperty(value="跟进图片地址 多个,号隔开")
+ private List<FileDto> picture;
- @ApiModelProperty("跟进视频地址 多个,号隔开")
- private String video;
+ @ApiModelProperty(value="跟进视频地址 多个,号隔开")
+ private List<FileDto> video;
- @ApiModelProperty("跟进音频地址 多个,号隔开")
- private String audio;
+ @ApiModelProperty(value="跟进音频地址 多个,号隔开")
+ private List<FileDto> audio;
- @ApiModelProperty("下次任务时间")
+ @ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
- @ApiModelProperty("下次任务内容")
+
+ @ApiModelProperty(value="下次任务内容")
private String nextTaskContent;
--
Gitblit v1.7.1