From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
index 9f98c54..065bc2a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -43,6 +43,10 @@
     @PropertyDef(label = "妫�楠岀被鍒�")
     private String jylb;
 
+    @JSONField(format = "yyyy-MM-dd")
+    @PropertyDef(label = "妫�楠屾棩鏈�")
+    private Date jyrq;
+
     @PropertyDef(label = "妫�楠屽崟浣�")
     private String jydw;
 
@@ -115,10 +119,6 @@
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
     private Date zhgxsj;
-
-    @JSONField(format = "yyyy-MM-dd")
-    @PropertyDef(label = "妫�楠屾棩鏈�")
-    private Date jyrq;
 
     @PropertyDef(label = "鏍囪浣�")
     private String bjw;

--
Gitblit v1.9.3