From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 26dcf98..d2a21ea 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
@@ -1,12 +1,10 @@
package com.ruoyi.shop.domain.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -21,33 +19,34 @@
@ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty("跟踪类型1电话2手动")
+ @ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
- @ApiModelProperty("拨打电话")
+ @ApiModelProperty(value="拨打电话")
private String callPhone;
- @ApiModelProperty("电话时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
- private Date callTime;
+ @ApiModelProperty(value="电话跟踪内容")
+ private List<MerFollowPhoneDto> followPhone;
- @ApiModelProperty("跟踪内容")
+ @ApiModelProperty(value="手动跟踪内容")
private String followContent;
- @ApiModelProperty("跟进图片地址 多个,号隔开")
+ @ApiModelProperty(value="跟进图片地址 多个,号隔开")
private String picture;
- @ApiModelProperty("跟进视频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进视频地址 多个,号隔开")
private String video;
- @ApiModelProperty("跟进音频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进音频地址 多个,号隔开")
private String audio;
- @ApiModelProperty("下次任务时间")
+ @ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
- @ApiModelProperty("下次任务内容")
+ @ApiModelProperty(value="下次任务紧急情况")
+ private String emergencyState;;
+
+ @ApiModelProperty(value="下次任务内容")
private String nextTaskContent;
--
Gitblit v1.7.1