From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..4806398 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,11 @@
package com.ruoyi.shop.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -15,19 +17,20 @@
@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手动")
private Integer followType;
@ApiModelProperty("电话时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTime;
@ApiModelProperty("跟踪内容")
@@ -36,12 +39,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