From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
index 5a01f0f..0234bf7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java
@@ -22,6 +22,10 @@
     @ApiModelProperty(value="跟踪类型1电话2手动")
     private Integer followType;
 
+    @ApiModelProperty(value="自定义跟进类型")
+    private String customeFollowType;
+
+
     @ApiModelProperty(value="拨打电话")
     private String callPhone;
 
@@ -43,6 +47,9 @@
     @ApiModelProperty(value="下次任务时间")
     private String nextTaskDate;
 
+    @ApiModelProperty(value="下次任务紧急情况")
+    private String emergencyState;;
+
     @ApiModelProperty(value="下次任务内容")
     private String nextTaskContent;
 

--
Gitblit v1.7.1