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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 d2a21ea..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
@@ -22,6 +22,9 @@
@ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
+ @ApiModelProperty(value="自定义跟进类型")
+ private String customeFollowType;
+
@ApiModelProperty(value="拨打电话")
private String callPhone;
@@ -32,19 +35,17 @@
private String followContent;
@ApiModelProperty(value="跟进图片地址 多个,号隔开")
- private String picture;
+ private List<FileDto> picture;
@ApiModelProperty(value="跟进视频地址 多个,号隔开")
- private String video;
+ private List<FileDto> video;
@ApiModelProperty(value="跟进音频地址 多个,号隔开")
- private String audio;
+ private List<FileDto> audio;
@ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
- @ApiModelProperty(value="下次任务紧急情况")
- private String emergencyState;;
@ApiModelProperty(value="下次任务内容")
private String nextTaskContent;
--
Gitblit v1.7.1