From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 3c42fb4..1651745 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -40,16 +40,16 @@
private String kqcq;
@PropertyDef(label = "鍌ㄥ浠撳")
- private double cbcr;
+ private Double cbcr;
@PropertyDef(label = "鏈夋晥浠撳")
- private double yxcr;
+ private Double yxcr;
@PropertyDef(label = "鏈夋晥缃愬")
- private double yxgr;
+ private Double yxgr;
@PropertyDef(label = "鍗犲湴闈㈢Н")
- private double zdmj;
+ private Double zdmj;
@PropertyDef(label = "浠撴埧鏁�")
private Integer cfs;
@@ -61,10 +61,10 @@
private Integer ygs;
@PropertyDef(label = "搴撳尯缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "搴撳尯绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -76,6 +76,9 @@
@PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
private String kqsx;
- @PropertyDef(label = "鏍囪浣�")
+ @PropertyDef(label = "搴撳尯鐘舵��")
+ private String kqzt;
+
+ @PropertyDef(label = "鏍囪浣�", description = "1:姝ｅ父(榛樿), 2:閫�鍑哄偍澶囩伯鎵垮偍")
private String bjw;
}
\ No newline at end of file
--
Gitblit v1.9.3