From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java index fb53613..6babd31 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -9,11 +10,13 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; +import java.util.Map; /** * 鐭俊閭欢淇℃伅琛� * @author 姹熻箘韫� - * @date 2024/01/15 11:15 + * @date 2024/01/16 10:03 */ @Data @ApiModel("鐭俊閭欢淇℃伅琛�") @@ -31,7 +34,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -40,7 +43,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -65,7 +68,7 @@ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1") @ExcelColumn(name="鎵嬫満鍙�") - private Integer phone; + private String phone; @ApiModelProperty(value = "閭") @ExcelColumn(name="閭") @@ -73,11 +76,11 @@ @ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�") @ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�") - private String status; + private Integer status; @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢") @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢") - private String type; + private Integer type; @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1") @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜") @@ -86,5 +89,8 @@ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷") @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷") private String objType; + @ApiModelProperty(value = "闄勪欢闆嗗悎") + @TableField(exist = false) + private List<Map<String,Object>> fileList; } -- Gitblit v1.9.3