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/MgtFollowShopTaskDto.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java
index c0573ba..196c27b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java
@@ -1,12 +1,8 @@
package com.ruoyi.shop.domain.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
/**
* @author jqs34
@@ -18,27 +14,28 @@
@Data
public class MgtFollowShopTaskDto extends MerBaseDto {
- @ApiModelProperty("商户id")
+ @ApiModelProperty(value="商户id")
private Long shopId;
- @ApiModelProperty("任务标题")
+ @ApiModelProperty(value="任务标题")
private String taskTitle;
- @ApiModelProperty("跟进类型")
+ @ApiModelProperty(value="跟进类型")
private String followType;
- @ApiModelProperty("跟进内容")
+
+ @ApiModelProperty(value="跟进内容")
private String followContent;
- @ApiModelProperty("跟进图片地址 多个,号隔开")
+ @ApiModelProperty(value="跟进图片地址 多个,号隔开")
private String picture;
- @ApiModelProperty("下次任务时间")
+ @ApiModelProperty(value="下次任务时间")
private String nextTaskDate;
- @ApiModelProperty("下次任务标题")
+ @ApiModelProperty(value="下次任务标题")
private String nextTaskTitle;
- @ApiModelProperty("紧急程度")
+ @ApiModelProperty(value="紧急程度")
private String emergencyState;
}
--
Gitblit v1.7.1