From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 08 七月 2023 18:37:12 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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..c8f2cb8 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
@@ -27,12 +25,10 @@
@ApiModelProperty("拨打电话")
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("电话跟踪内容")
+ private List<MerFollowPhoneDto> followPhone;
- @ApiModelProperty("跟踪内容")
+ @ApiModelProperty("手动跟踪内容")
private String followContent;
@ApiModelProperty("跟进图片地址 多个,号隔开")
--
Gitblit v1.7.1