From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期五, 18 八月 2023 23:05:34 +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 |    3 ---
 1 files changed, 0 insertions(+), 3 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 0234bf7..9422db1 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
@@ -25,7 +25,6 @@
     @ApiModelProperty(value="自定义跟进类型")
     private String customeFollowType;
 
-
     @ApiModelProperty(value="拨打电话")
     private String callPhone;
 
@@ -47,8 +46,6 @@
     @ApiModelProperty(value="下次任务时间")
     private String nextTaskDate;
 
-    @ApiModelProperty(value="下次任务紧急情况")
-    private String emergencyState;;
 
     @ApiModelProperty(value="下次任务内容")
     private String nextTaskContent;

--
Gitblit v1.7.1