From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffFollowShopTaskDto.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffFollowShopTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffFollowShopTaskDto.java
index 3c6bc9d..ca6ad7a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffFollowShopTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/StaffFollowShopTaskDto.java
@@ -32,13 +32,13 @@
private String followContent;
@ApiModelProperty(value="跟进图片地址 多个,号隔开")
- private String picture;
+ private List<FileDto> picture;
@ApiModelProperty(value="跟进视频地址 多个,号隔开")
- private String video;
+ private List<FileDto> video;
@ApiModelProperty(value="跟进音频地址 多个,号隔开")
- private String audio;
+ private List<FileDto> audio;
@ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
@@ -47,7 +47,7 @@
private String nextTaskContent;
@ApiModelProperty(value="跟踪类型")
- private String customFollowType;
+ private String customeFollowType;
@ApiModelProperty(value="紧急程度")
private String emergencyState;
--
Gitblit v1.7.1