From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java b/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
index 1d0fa35..8872777 100644
--- a/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/sms/SmsTaskVO.java
@@ -1,22 +1,44 @@
package com.mzl.flower.dto.response.sms;
import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
@Data
public class SmsTaskVO extends AbstractTransDTO {
@ApiModelProperty(value = "短信任务管理id")
private Long id;
- @ApiModelProperty("短信模板ID")
- private Long smsTemplateId;
-
@ApiModelProperty("名称")
private String name;
+ @ApiModelProperty("短信模板ID")
+ private Long smsTemplateId;
+
+ @ApiModelProperty("短信模板名称")
+ private String smsTemplateName;
+
+ @ApiModelProperty("短信模板描述")
+ private String smsTemplateDesc;
+
+ @ApiModelProperty("任务状态")
+ @DictTrans(target = "statusStr", codeType = "SMS_TASK_STATUS")
+ private String status;
+
+ private String statusStr;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createTime;
+
@ApiModelProperty("任务类型")
private String type;
+
+ @DictTrans(target = "typeStr", codeType = "SMS_TASK_STATUS")
+ private String typeStr;
@ApiModelProperty("导入文件路径")
private String fileUrl;
@@ -24,7 +46,6 @@
@ApiModelProperty("手机号")
private String phones;
- @ApiModelProperty("发送数量")
- private Long num;
+ private List<SmsSelectVO> smsUserDTOS;
}
--
Gitblit v1.9.3