From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
index 60a89be..0cb17a0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.shop.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.shop.domain.dto.FileDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,6 +27,9 @@
@ApiModelProperty(value = "用户头像")
private String userPicture;
+ @ApiModelProperty(value = "用户岗位")
+ private String userPosition;
+
@ApiModelProperty(value = "跟进id")
private Long followId;
@@ -37,7 +41,7 @@
private Date createTime;
@ApiModelProperty(value="跟踪类型1电话2手动")
- private Integer followType;
+ private String followType;
@ApiModelProperty(value="自定义跟进类型")
private String customeFollowType;
@@ -53,11 +57,11 @@
private String callPhone;
@ApiModelProperty(value="跟进图片地址")
- private List<String> picture;
+ private List<FileDto> picture;
@ApiModelProperty(value="跟进视频地址")
- private List<String> video;
+ private List<FileDto> video;
@ApiModelProperty(value="跟进音频地址")
- private List<String> audio;
+ private List<FileDto> audio;
}
--
Gitblit v1.7.1