From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java
index d420b2c..6fb65d2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java
@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
/**
* @author jqs34
* @ClassName merCreateMemberTaskDto
@@ -16,14 +14,15 @@
@Data
public class MerCreateMemberTaskDto extends MerBaseDto {
- @ApiModelProperty(name = "跟进会员用户id")
+ @ApiModelProperty(value = "跟进会员用户id")
private Long memberUserId;
- @ApiModelProperty(name = "任务时间")
- private Date taskDate;
+ @ApiModelProperty(value = "任务时间")
+ private String taskDate;
- @ApiModelProperty(name = "任务内容")
+ @ApiModelProperty(value = "任务内容")
private String taskContent;
-
+ @ApiModelProperty(value="紧急情况")
+ private String emergencyState;;
}
--
Gitblit v1.7.1