From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +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/vo/MerMemberTaskRecordPageVo.java |    7 ++++---
 1 files changed, 4 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 66a1cb8..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;
 
@@ -43,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