From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index 12677c3..b68ef72 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -47,9 +47,6 @@
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
- @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
- private String lqgsdwdm;
-
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -65,11 +62,11 @@
@PropertyDef(label = "杩愯緭宸ュ叿")
private String ysgj;
- @PropertyDef(label = "杞﹁埞鍙�")
- private String cch;
-
@PropertyDef(label = "杞﹁埞鍙风被鍨�")
private String cchlx;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
@PropertyDef(label = "鎸傝溅鍙�")
private String gch;
@@ -100,7 +97,7 @@
private String jjlx;
@PropertyDef(label = "姣涢噸(鍏枻)")
- private double mz;
+ private Double mz;
@PropertyDef(label = "姣涢噸鐩戠鍛�")
private String mzjby;
@@ -116,7 +113,7 @@
private String zcy;
@PropertyDef(label = "鐨噸(鍏枻)")
- private double pz;
+ private Double pz;
@PropertyDef(label = "鐨噸鐩戠鍛�")
private String pzjby;
@@ -132,65 +129,65 @@
private String bzw;
@PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
- private double bzbdbz = 25;
+ private Double bzbdbz;
@PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
private Integer bzbjs;
@PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
- private double zjklxj;
+ private Double zjklxj;
@PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
- private double qzsfzkl;
+ private Double qzsfzkl;
@PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
- private double qzzzzkl;
+ private Double qzzzzkl;
@PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
- private double qzbwslkl;
+ private Double qzbwslkl;
@PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
- private double qzhhkl;
+ private Double qzhhkl;
@PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
- private double qzsmlkl;
+ private Double qzsmlkl;
@PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
- private double qzzjmlkl;
+ private Double qzzjmlkl;
@PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
- private double qzgwcmkl;
+ private Double qzgwcmkl;
@PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
- private double qzhlmkl;
+ private Double qzhlmkl;
@PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
- private double qzqtkl;
+ private Double qzqtkl;
@PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
- private double zlfyzkl;
+ private Double zlfyzkl;
@PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
- private double bzwkl;
+ private Double bzwkl;
@PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
- private double qtkl;
+ private Double qtkl;
@PropertyDef(label = "鎵ｉ噺鍘熷洜")
private String klyy;
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
@Column(name = "xckl")
- private double xckl;
+ private Double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
- private double zkj;
+ private Double zkj;
@PropertyDef(label = "澧炴墸浠峰師鍥�")
private String zkhyy;
@PropertyDef(label = "鍑�閲�(鍏枻)")
- private double jz;
+ private Double jz;
@PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
private String zxzydw;
@@ -215,10 +212,10 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date zhgxsj;
- private String pch;
+ private String pch = "鏃�";
private String bjw;
- private String bydh;
- private String jjdh;
+ private String bydh = "鏃�";
+ private String jjdh = "鏃�";
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
--
Gitblit v1.9.3