From d1b7f2eb67cd87edc4b5eb11def5acba07c75698 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 21 十二月 2023 15:09:27 +0800
Subject: [PATCH] 根据上海新接口规则进行调整

---
 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
index 42fcb22..21dd4b1 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -29,16 +29,14 @@
     private String dwlx;
 
     @PropertyDef(label = "娉ㄥ唽鏃ユ湡")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @JSONField(format = "yyyy-MM-dd")
     private Date zcrq;
 
     @PropertyDef(label = "娉ㄥ唽璧勬湰")
-    private double zczb;
+    private Double zczb;
 
     @PropertyDef(label = "璧勪骇鎬婚")
-    private double zcze;
+    private Double zcze;
 
     @PropertyDef(label = "娉曞畾浠h〃浜�")
     private String fddbr;
@@ -59,13 +57,16 @@
     private String zcdz;
 
     @PropertyDef(label = "鐢靛瓙閭")
-    private String dzyx;
+    @JSONField(serialize = true)
+    private String dzyx = "鏃�";
 
     @PropertyDef(label = "浼佷笟瀹樻柟缃戠珯鍦板潃")
-    private String qygfwzdz;
+    @JSONField(serialize = true)
+    private String qygfwzdz = "鏃�";
 
     @PropertyDef(label = "浼犵湡鍙风爜")
-    private String czhm;
+    @JSONField(serialize = true)
+    private String czhm = "鏃�";
 
     @PropertyDef(label = "閭斂缂栫爜")
     private String yzbm;
@@ -73,15 +74,13 @@
     @PropertyDef(label = "琛屾斂鍖哄垝浠g爜")
     private String xzqhdm;
 
-    @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
-    @JSONField(serialize = false)
-    private String xzqhmc;
-
     @PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
-    private String sjdwmc;
+    @JSONField(serialize = true)
+    private String sjdwmc = "鏃�";
 
     @PropertyDef(label = "涓婄骇鍗曚綅浠g爜")
-    private String sjdwdm;
+    @JSONField(serialize = true)
+    private String sjdwdm = "鏃�";
 
     @PropertyDef(label = "搴撳尯鏁�")
     private Integer kqs;
@@ -92,23 +91,25 @@
     @PropertyDef(label = "寤掗棿鏁�")
     private Integer ajs;
 
+    @PropertyDef(label = "鍗曚綅鐘舵��")
+    private String dwzt;
+
     @PropertyDef(label = "娌圭綈鏁�")
     private Integer ygs;
 
     @PropertyDef(label = "缁忓害")
-    private double jd;
+    private Double jd;
 
     @PropertyDef(label = "绾害")
-    private double wd;
+    private Double wd;
 
     @PropertyDef(label = "鎿嶄綔鏍囧織")
     private String czbz;
-
-    @PropertyDef(label = "鏍囪浣�")
-    private String bjw;
 
     @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date zhgxsj;
 
+    @PropertyDef(label = "鏍囪浣�")
+    private String bjw;
 }
\ No newline at end of file

--
Gitblit v1.9.3