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/api/entity/Api1202.java | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index f8f9a08..128c4d7 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -26,12 +26,6 @@
public static String SORT_PROP = "rkywdh";
-
-// @Id
-// @JSONField(serialize = false)
-// @Column(name = "id", length = 40)
-// private String id;
-
//12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
@Id
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
@@ -129,7 +123,7 @@
private String jjlx;
@PropertyDef(label = "姣涢噸(鍏枻)")
- @Column(name = "mz", precision = 20, scale = 6)
+ @Column(name = "mz")
private double mz;
@PropertyDef(label = "姣涢噸鐩戠鍛�")
@@ -150,7 +144,7 @@
private String zcy;
@PropertyDef(label = "鐨噸(鍏枻)")
- @Column(name = "pz", precision = 20, scale = 6)
+ @Column(name = "pz")
private double pz;
@PropertyDef(label = "鐨噸鐩戠鍛�")
@@ -171,84 +165,84 @@
private String bzw;
@PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
- @Column(name = "bzbdbz", precision = 20, scale = 6)
- private double bzbdbz = 25;
+ @Column(name = "bzbdbz")
+ private Double bzbdbz = 25.0;
@PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
@Column(name = "bzbjs")
private Integer bzbjs;
@PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
- @Column(name = "zjklxj", precision = 20, scale = 6)
- private double zjklxj;
+ @Column(name = "zjklxj")
+ private Double zjklxj;
@PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
- @Column(name = "qzsfzkl", precision = 20, scale = 6)
- private double qzsfzkl;
+ @Column(name = "qzsfzkl")
+ private Double qzsfzkl;
@PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
- @Column(name = "qzzzzkl", precision = 20, scale = 6)
- private double qzzzzkl;
+ @Column(name = "qzzzzkl")
+ private Double qzzzzkl;
@PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
- @Column(name = "qzbwslkl", precision = 20, scale = 6)
- private double qzbwslkl;
+ @Column(name = "qzbwslkl")
+ private Double qzbwslkl;
@PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
- @Column(name = "qzhhkl", precision = 20, scale = 6)
- private double qzhhkl;
+ @Column(name = "qzhhkl")
+ private Double qzhhkl;
@PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
- @Column(name = "qzsmlkl", precision = 20, scale = 6)
- private double qzsmlkl;
+ @Column(name = "qzsmlkl")
+ private Double qzsmlkl;
@PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
- @Column(name = "qzzjmlkl", precision = 20, scale = 6)
- private double qzzjmlkl;
+ @Column(name = "qzzjmlkl")
+ private Double qzzjmlkl;
@PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
- @Column(name = "qzgwcmkl", precision = 20, scale = 6)
- private double qzgwcmkl;
+ @Column(name = "qzgwcmkl")
+ private Double qzgwcmkl;
@PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
- @Column(name = "qzhlmkl", precision = 20, scale = 6)
- private double qzhlmkl;
+ @Column(name = "qzhlmkl")
+ private Double qzhlmkl;
@PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
- @Column(name = "qzqtkl", precision = 20, scale = 6)
- private double qzqtkl;
+ @Column(name = "qzqtkl")
+ private Double qzqtkl;
@PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
- @Column(name = "zlfyzkl", precision = 20, scale = 6)
- private double zlfyzkl;
+ @Column(name = "zlfyzkl")
+ private Double zlfyzkl;
@PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
- @Column(name = "bzwkl", precision = 20, scale = 6)
- private double bzwkl;
+ @Column(name = "bzwkl")
+ private Double bzwkl;
@PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
- @Column(name = "qtkl", precision = 20, scale = 6)
- private double qtkl;
+ @Column(name = "qtkl")
+ private Double qtkl;
@PropertyDef(label = "鎵ｉ噺鍘熷洜")
@Column(name = "klyy", length = 512)
private String klyy;
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
- @Column(name = "xckl", precision = 20, scale = 6)
- private double xckl;
+ @Column(name = "xckl")
+ private Double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
- @Column(name = "zkj", precision = 20, scale = 6)
- private double zkj;
+ @Column(name = "zkj")
+ private Double zkj;
@PropertyDef(label = "澧炴墸浠峰師鍥�")
@Column(name = "zkhyy", length = 27)
private String zkhyy;
@PropertyDef(label = "鍑�閲�(鍏枻)")
- @Column(name = "jz", precision = 20, scale = 6)
- private double jz;
+ @Column(name = "jz")
+ private Double jz;
@PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
@Column(name = "zxzydw", length = 256)
--
Gitblit v1.9.3