From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 26dcf98..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
@@ -1,12 +1,10 @@
package com.ruoyi.shop.domain.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -21,33 +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("电话时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
- private Date callTime;
+ @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