From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/quality/dto/ProcessPageDto.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/ProcessPageDto.java b/src/main/java/com/ruoyi/quality/dto/ProcessPageDto.java
index 58202be..296debe 100644
--- a/src/main/java/com/ruoyi/quality/dto/ProcessPageDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/ProcessPageDto.java
@@ -10,6 +10,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -17,7 +18,7 @@
public class ProcessPageDto {
@ApiModelProperty("鐢熶骇鎶ュ伐璁板綍鐨勫伐搴忚〃id")
- private Long ProductionProductRouteItemId;
+ private Long productionProductRouteItemId;
@ApiModelProperty(value = "鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -60,7 +61,11 @@
@ApiModelProperty("浜у嚭鏁伴噺")
private BigDecimal quantity;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startTime;
- private LocalDateTime startTime;
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endTime;
}
--
Gitblit v1.9.3