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/vo/MerMemberTaskRecordPageVo.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java
index a35bcdc..9ead902 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java
@@ -1,9 +1,12 @@
package com.ruoyi.shop.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.shop.domain.dto.FileDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -15,33 +18,37 @@
@Data
public class MerMemberTaskRecordPageVo {
- @ApiModelProperty(name = "跟进id")
+ @ApiModelProperty(value = "跟进id")
private Long followId;
- @ApiModelProperty(name = "任务id")
+ @ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty(name = "任务时间")
- private Date taskDate;
+ @ApiModelProperty(value = "任务时间")
+ private String taskDate;
- @ApiModelProperty("跟踪类型1电话2手动")
+ @ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
- @ApiModelProperty("电话时间")
+ @ApiModelProperty(value="自定义跟进类型")
+ private String customeFollowType;
+
+ @ApiModelProperty(value="电话时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTime;
- @ApiModelProperty("跟踪内容")
+ @ApiModelProperty(value="跟踪内容")
private String followContent;
- @ApiModelProperty("拨打电话")
+ @ApiModelProperty(value="拨打电话")
private String callPhone;
- @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;
}
--
Gitblit v1.7.1