From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 01 四月 2025 16:03:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOperLogPageDto.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOperLogPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOperLogPageDto.java index 54352d5..cacda7f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOperLogPageDto.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOperLogPageDto.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @ClassName MgtOperLogPageDto * @Description TODO @@ -24,10 +22,10 @@ private String operTitle; @ApiModelProperty(value = "操作开始时间") - private Date operStartTime; + private String operStartTime; @ApiModelProperty(value = "操作结束时间") - private Date operEndTime; + private String operEndTime; } -- Gitblit v1.7.1