From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-verb/src/main/java/com/ld/igds/models/MAreationData.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java b/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
index 736cca0..b761e2c 100644
--- a/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
+++ b/igds-verb/src/main/java/com/ld/igds/models/MAreationData.java
@@ -47,7 +47,7 @@
 
 	@PropertyDef(label = "绮爢瀛旈殭搴�")
 	@Column(name = "ldkxd", precision = 10, scale = 3)
-	private double ldkxd;
+	private Double ldkxd;
 
 	/**
 	 * 1锛氳嚜鐒剁┖姘旈�氶
@@ -79,23 +79,23 @@
 
 	@PropertyDef(label = "涓婚閬撴埅闈㈢Н")
 	@Column(name = "zfdjmj", precision = 10, scale = 3)
-	private double zfdjmj;
+	private Double zfdjmj;
 
 	@PropertyDef(label = "鏀閬撴埅闈㈢Н")
 	@Column(name = "zhfdjmj", precision = 10, scale = 3)
-	private double zhfdjmj;
+	private Double zhfdjmj;
 
 	@PropertyDef(label = "鏀閬撴�婚暱搴�")
 	@Column(name = "zfdzcd", precision = 20, scale = 3)
-	private double zfdzcd;
+	private Double zfdzcd;
 
 	@PropertyDef(label = "椋庣綉寮�瀛旂巼")
 	@Column(name = "fwkkl", precision = 10, scale = 3)
-	private double fwkkl;
+	private Double fwkkl;
 
 	@PropertyDef(label = "绌烘皵閫斿緞姣�")
 	@Column(name = "kqtjb", precision = 10, scale = 3)
-	private double kqtjb;
+	private Double kqtjb;
 
 	@PropertyDef(label = "閫氶鍙h缃釜鏁�")
 	@Column(name = "tfkszgs")
@@ -111,15 +111,15 @@
 
 	@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇")
 	@Column(name = "dtfjedqy", precision = 10, scale = 3)
-	private double dtfjedqy;
+	private Double dtfjedqy;
 
 	@PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺")
 	@Column(name = "dtfjedfl", precision = 10, scale = 3)
-	private double dtfjedfl;
+	private Double dtfjedfl;
 
 	@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼")
 	@Column(name = "dtfjedgl", precision = 10, scale = 3)
-	private double dtfjedgl;
+	private Double dtfjedgl;
 
 	/**
 	 * 1锛氬帇鍏ュ紡閫氶
@@ -134,23 +134,23 @@
 
 	@PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺")
 	@Column(name = "dtfjscfl", precision = 10, scale = 3)
-	private double dtfjscfl;
+	private Double dtfjscfl;
 
 	@PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�")
 	@Column(name = "dtfjzgl", precision = 10, scale = 3)
-	private double dtfjzgl;
+	private Double dtfjzgl;
 
 	@PropertyDef(label = "鎬婚閲�")
 	@Column(name = "zfl", precision = 10, scale = 3)
-	private double zfl;
+	private Double zfl;
 
 	@PropertyDef(label = "鍗曚綅閫氶閲�")
 	@Column(name = "dwtfl", precision = 10, scale = 3)
-	private double dwtfl;
+	private Double dwtfl;
 
 	@PropertyDef(label = "瀹炴祴绯荤粺闃诲姏")
 	@Column(name = "scxtzl", precision = 10, scale = 3)
-	private double scxtzl;
+	private Double scxtzl;
 
 	/**
 	 * 鎬昏�楃數閲� 鍗冪摝
@@ -217,11 +217,11 @@
 
 	@PropertyDef(label = "闄嶆按骞呭害")
 	@Column(name = "jsfd", precision = 10, scale = 3)
-	private double jsfd;
+	private Double jsfd;
 
 	@PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��")
 	@Column(name = "dljsnh", precision = 10, scale = 3)
-	private double dljsnh;
+	private Double dljsnh;
 
 	@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨")
 	@Column(name = "tfjsjyxfxzc", length = 128)

--
Gitblit v1.9.3