From 3fb8fc0d2093a0646b11e5f2dc3b78bd6b633635 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 14 六月 2023 18:40:26 +0800
Subject: [PATCH] 活动管理

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 6694580..d76ca8c 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,5 +1,6 @@
 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;
@@ -16,7 +17,7 @@
 @Data
 public class MerFollowMemberTaskDto extends MerBaseDto {
 
-    @ApiModelProperty(name = "任务id")
+    @ApiModelProperty(value = "任务id")
     private String taskId;
 
     @ApiModelProperty("跟踪类型1电话2手动")
@@ -26,6 +27,7 @@
     private String callPhone;
 
     @ApiModelProperty("电话时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date callTime;
 
     @ApiModelProperty("跟踪内容")

--
Gitblit v1.7.1