From a03d12962c4439cce9193f178c02164db20f734c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 23 四月 2024 20:30:49 +0800
Subject: [PATCH] 调整指令解析

---
 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 12e7202..579887d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -17,16 +17,12 @@
  * 鎺ュ彛琛�-搴撳尯淇℃伅
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 public class SH2023Api1102 implements Serializable {
 
     private static final long serialVersionUID = 6597930270077627879L;
 
     @PropertyDef(label = "搴撳尯浠g爜")
     private String kqdm;
-
-    @PropertyDef(label = "涓氬姟id")
-    private String bizId;
 
     @PropertyDef(label = "鍗曚綅浠g爜")
     private String dwdm;
@@ -40,24 +36,17 @@
     @PropertyDef(label = "琛屾斂鍖哄垝浠g爜")
     private String xzqhdm;
 
-    @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
-    @JSONField(serialize = false)
-    private String xzqhmc;
-
     @PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
     private String kqcq;
 
     @PropertyDef(label = "鏈夋晥浠撳")
-    private double yxcr;
-
-    @PropertyDef(label = "鍌ㄥ浠撳")
-    private double cbcr;
+    private Double yxcr;
 
     @PropertyDef(label = "鏈夋晥缃愬")
-    private double yxgr;
+    private Double yxgr;
 
     @PropertyDef(label = "鍗犲湴闈㈢Н")
-    private double zdmj;
+    private Double zdmj;
 
     @PropertyDef(label = "浠撴埧鏁�")
     private Integer cfs;
@@ -66,19 +55,13 @@
     private Integer ygs;
 
     @PropertyDef(label = "搴撳尯缁忓害")
-    private double jd;
+    private Double jd;
 
     @PropertyDef(label = "搴撳尯绾害")
-    private double wd;
+    private Double wd;
 
     @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝e父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
     private String kqzt;
-
-    @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
-    private String hkRegionId;
-
-    @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠g爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠g爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
-    private String cqfkqdm;
 
     @PropertyDef(label = "鎿嶄綔鏍囧織")
     private String czbz;
@@ -87,15 +70,15 @@
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date zhgxsj;
 
-    @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
-    @JSONField(serialize = false)
+    @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:甯傜骇浠e偍锛�3:鍖虹骇鐩村偍锛�4:鍖虹骇浠e偍锛�9锛氬叾浠�")
     private String kqsx;
 
     @PropertyDef(label = "寤掗棿鏁�")
     private Integer ajs;
 
-    @PropertyDef(label = "鏍囪浣�")
+    @PropertyDef(label = "鏍囪浣�", description = "1:姝e父(榛樿), 2:閫�鍑哄偍澶囩伯鎵垮偍")
     private String bjw;
 
-
+    @PropertyDef(label = "鍌ㄥ浠撳")
+    private Double cbcr;
 }
\ No newline at end of file

--
Gitblit v1.9.3