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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 3821fc7..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,6 +1,7 @@
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;
@@ -29,6 +30,9 @@
@ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
+ @ApiModelProperty(value="自定义跟进类型")
+ private String customeFollowType;
+
@ApiModelProperty(value="电话时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTime;
@@ -40,11 +44,11 @@
private String callPhone;
@ApiModelProperty(value="跟进图片地址")
- private List<String> picture;
+ private List<FileDto> picture;
@ApiModelProperty(value="跟进视频地址")
- private List<String> video;
+ private List<FileDto> video;
@ApiModelProperty(value="跟进音频地址")
- private List<String> audio;
+ private List<FileDto> audio;
}
--
Gitblit v1.7.1