From b437ca4b3ba3fadc821e4b01398c3257e540fcb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index 0d205a8..65570b2 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -78,8 +78,8 @@
@ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
private Integer status;
- @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢")
- @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢")
+ @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
+ @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
private Integer type;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
@@ -93,5 +93,11 @@
@ApiModelProperty(value = "闄勪欢闆嗗悎")
@TableField(exist = false)
private List<Map<String,Object>> fileList;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
}
--
Gitblit v1.9.3