From 563ffc29857acd93c7298ddfca700c1fb01b18e0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 17:03:19 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
index ef75ae3..1b31828 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
@@ -1,9 +1,11 @@
 package com.vincent.rsf.server.api.controller.erp.params;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -19,7 +21,9 @@
     private String PONO;
 
     @ApiModelProperty("鍏ュ簱鏃ユ湡")
-    private String OrderDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date OrderDate;
 
     @ApiModelProperty("閲囪喘閫�璐у崟鍙�/鐢熶骇鍗曞彿/")
     private String OrderNO;
@@ -45,10 +49,15 @@
     @ApiModelProperty("鍑哄簱鏁伴噺")
     private Double OutQty;
 
+    @ApiModelProperty("搴撲綅")
+    private String Zone;
+
     @ApiModelProperty("缂栬緫鐢ㄦ埛")
     private String EditUser;
 
     @ApiModelProperty("缂栬緫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date EditDate;
 
     @ApiModelProperty("澶囨敞璇存槑")

--
Gitblit v1.9.1