From 21573e8e02dc47202ca3e1f7d4705795a09c1b60 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOneClinkSyncingPageDTO.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOneClinkSyncingPageDTO.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOneClinkSyncingPageDTO.java
index 5ad529e..1643431 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOneClinkSyncingPageDTO.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtOneClinkSyncingPageDTO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import org.springframework.cglib.core.Local;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -19,10 +20,13 @@
private String syncingName;
@ApiModelProperty(value = "操作同步时间范围-开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime syncingStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate syncingStartTime;
@ApiModelProperty(value = "操作同步时间范围-结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime syncingEndTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate syncingEndTime;
+
+ private LocalDateTime startTime;
+ private LocalDateTime endTime;
}
--
Gitblit v1.7.1