From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 38667d5..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,5 +1,6 @@
 package com.ruoyi.shop.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,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 = "任务时间")
+    @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
     @ApiModelProperty("跟踪类型1电话2手动")
     private Integer followType;
 
     @ApiModelProperty("电话时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date callTime;
 
     @ApiModelProperty("跟踪内容")

--
Gitblit v1.7.1