From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java
index faa84ef..60519d3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java
@@ -19,31 +19,34 @@
@ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty("跟踪类型1电话2手动")
+ @ApiModelProperty(value="跟踪类型1电话2手动")
private Integer followType;
- @ApiModelProperty("拨打电话")
+ @ApiModelProperty(value="拨打电话")
private String callPhone;
- @ApiModelProperty("电话跟踪内容")
+ @ApiModelProperty(value="电话跟踪内容")
private List<MerFollowPhoneDto> followPhone;
- @ApiModelProperty("跟踪内容")
+ @ApiModelProperty(value="跟踪内容")
private String followContent;
- @ApiModelProperty("跟进图片地址 多个,号隔开")
+ @ApiModelProperty(value="跟进图片地址 多个,号隔开")
private String picture;
- @ApiModelProperty("跟进视频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进视频地址 多个,号隔开")
private String video;
- @ApiModelProperty("跟进音频地址 多个,号隔开")
+ @ApiModelProperty(value="跟进音频地址 多个,号隔开")
private String audio;
- @ApiModelProperty("下次任务时间")
+ @ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
- @ApiModelProperty("下次任务内容")
+ @ApiModelProperty(value="下次任务紧急情况")
+ private String emergencyState;;
+
+ @ApiModelProperty(value="下次任务内容")
private String nextTaskContent;
--
Gitblit v1.7.1