From 4941a9e02e1a89ae3e584787ac1cbf580825f2f2 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 25 十一月 2024 18:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
index fe86190..b55e719 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
@@ -14,6 +14,9 @@
 @Data
 public class Nx2023Api1207 implements Serializable {
 
+    @PropertyDef(label = "缁熶竴鍊掍粨鍗曞彿" )
+    private String tydcdh;
+
     @PropertyDef(label = "鍊掍粨鍗曞彿" )
     private String dcdh;
 
@@ -26,37 +29,45 @@
     @PropertyDef(label = "閫氱煡鍗曞彿" )
     private String tzdh;
 
-    @PropertyDef(label = "鍊掑嚭鍗曚綅" )
-    private String dcdw;
-
-    @PropertyDef(label = "鍊掑叆鍗曚綅" )
-    private String drdw;
-
     @PropertyDef(label = "鍊掑嚭搴撳尯缁熶竴缂栫爜")
     private String dckqtybm;
+
+    @PropertyDef(label = "鍊掑嚭鍗曚綅" )
+    private String dcdw;
 
     @PropertyDef(label = "鍊掑叆搴撳尯缁熶竴缂栫爜")
     private String drkqtybm;
 
+    @PropertyDef(label = "鍊掑叆鍗曚綅" )
+    private String drdw;
+
     @PropertyDef(label = "绮鍝佺浠g爜" )
     private String lspzdm;
-
-    @PropertyDef(label = "鍊掑嚭璐т綅浠g爜" )
-    private String dchwdm;
-
-    @PropertyDef(label = "鍊掑叆璐т綅浠g爜" )
-    private String drhwdm;
 
     @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
     private String dchwtybm;
 
+    @PropertyDef(label = "鍊掑嚭璐т綅浠g爜" )
+    private String dchwdm;
+
     @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
     private String drhwtybm;
+
+    @PropertyDef(label = "鍊掑叆璐т綅浠g爜" )
+    private String drhwdm;
 
     @JSONField(format = "yyyy-MM-dd")
     @PropertyDef(label = "鍊掍粨鏃ユ湡" )
     private Date dcrq;
 
+    @JSONField(format = "yyyy-MM-dd")
+    @PropertyDef(label = "鍊掍粨寮�濮嬫棩鏈�" )
+    private Date dcksrq;
+
+    @JSONField(format = "yyyy-MM-dd")
+    @PropertyDef(label = "鍊掍粨缁撴潫鏃ユ湡" )
+    private Date dcjsrq;
+
     @PropertyDef(label = "鍊掍粨鏁伴噺(鍏枻)" )
     private double dcsl;
 

--
Gitblit v1.9.3