From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java
index f900342..bf9a270 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java
@@ -14,14 +14,15 @@
@Data
public class MerCreateAgencyTaskDto extends MerBaseDto {
- @ApiModelProperty(name = "跟进代理商id")
+ @ApiModelProperty(value = "跟进代理商id")
private Long agencyId;
- @ApiModelProperty(name = "任务时间")
+ @ApiModelProperty(value = "任务时间")
private String taskDate;
- @ApiModelProperty(name = "任务内容")
+ @ApiModelProperty(value = "任务内容")
private String taskContent;
-
+ @ApiModelProperty(value="紧急情况")
+ private String emergencyState;;
}
--
Gitblit v1.7.1