From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 d32df7f..0538082 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
@@ -22,6 +22,9 @@
     @ApiModelProperty(value="跟踪类型1电话2手动")
     private Integer followType;
 
+    @ApiModelProperty(value="自定义跟进类型")
+    private String customeFollowType;
+
     @ApiModelProperty(value="拨打电话")
     private String callPhone;
 
@@ -43,6 +46,9 @@
     @ApiModelProperty(value="下次任务时间")
     private String nextTaskDate;
 
+    @ApiModelProperty(value="下次任务紧急情况")
+    private String emergencyState;;
+
     @ApiModelProperty(value="下次任务内容")
     private String nextTaskContent;
 

--
Gitblit v1.7.1