From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 14 +++++++-------
1 files changed, 7 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 88463bf..df3557b 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;
@@ -73,7 +73,7 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
- @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
+ @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:甯傜骇浠ｅ偍锛�3:鍖虹骇鐩村偍锛�4:鍖虹骇浠ｅ偍锛�9锛氬叾浠�")
private String kqsx;
@PropertyDef(label = "搴撳尯鐘舵��")
--
Gitblit v1.9.3