From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 0234bf7..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
@@ -25,7 +25,6 @@
     @ApiModelProperty(value="自定义跟进类型")
     private String customeFollowType;
 
-
     @ApiModelProperty(value="拨打电话")
     private String callPhone;
 
@@ -36,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