From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001 From: zhanglin8526 <852614290@qq.com> Date: 星期二, 09 五月 2023 18:38:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 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..38667d5 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 @@ -4,6 +4,7 @@ import lombok.Data; import java.util.Date; +import java.util.List; /** * @author jqs34 @@ -22,7 +23,7 @@ private String taskId; @ApiModelProperty(name = "任务时间") - private Date taskDate; + private String taskDate; @ApiModelProperty("跟踪类型1电话2手动") private Integer followType; @@ -36,12 +37,12 @@ @ApiModelProperty("拨打电话") private String callPhone; - @ApiModelProperty("跟进图片地址 多个,号隔开") - private String picture; + @ApiModelProperty("跟进图片地址") + private List<String> picture; - @ApiModelProperty("跟进视频地址 多个,号隔开") - private String video; + @ApiModelProperty("跟进视频地址") + private List<String> video; - @ApiModelProperty("跟进音频地址 多个,号隔开") - private String audio; + @ApiModelProperty("跟进音频地址") + private List<String> audio; } -- Gitblit v1.7.1