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/Api1103.java | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index f2e5b81..d510e2e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1103.java
+++ b/src/main/java/com/fzzy/api/entity/Api1103.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -21,22 +20,9 @@
@EqualsAndHashCode(callSuper=false)
public class Api1103 implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8095346227076335949L;
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
- private String bizId;
-
-
- @JSONField(serialize = false)
- @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
- @Column(name = "syncTime")
- private Date syncTime;
-
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "浠撴埧浠ｇ爜" )
@Column(name = "cfdm", length = 25)
@@ -56,7 +42,7 @@
@PropertyDef(label = "浜や粯浣跨敤鏃ユ湡" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "jfsyrq", nullable = false)
+ @Column(name = "jfsyrq")
private Date jfsyrq;
@PropertyDef(label = "寤鸿鍗曚綅" )
@@ -93,51 +79,51 @@
@PropertyDef(label = "璁捐浠撳" )
@Column(name = "sjcr", precision = 20, scale = 6)
- private double sjcr;
+ private Double sjcr;
@PropertyDef(label = "浠撳闀�" )
@Column(name = "cwc", precision = 20, scale = 6)
- private double cwc;
+ private Double cwc;
@PropertyDef(label = "浠撳瀹�" )
@Column(name = "cwk", precision = 20, scale = 6)
- private double cwk;
+ private Double cwk;
@PropertyDef(label = "浠撳妾愰珮" )
@Column(name = "cwyg", precision = 20, scale = 6)
- private double cwyg;
+ private Double cwyg;
@PropertyDef(label = "浠撳椤堕珮" )
@Column(name = "cwdg", precision = 20, scale = 6)
- private double cwdg;
+ private Double cwdg;
@PropertyDef(label = "绛掍粨澶栧緞" )
@Column(name = "tcwj", precision = 20, scale = 6)
- private double tcwj;
+ private Double tcwj;
@PropertyDef(label = "浠撳唴闀�" )
@Column(name = "cnc", precision = 20, scale = 6)
- private double cnc;
+ private Double cnc;
@PropertyDef(label = "浠撳唴瀹�" )
@Column(name = "cnk", precision = 20, scale = 6)
- private double cnk;
+ private Double cnk;
@PropertyDef(label = "浠撳唴妾愰珮" )
@Column(name = "cnyg", precision = 20, scale = 6)
- private double cnyg;
+ private Double cnyg;
@PropertyDef(label = "浠撳唴瑁呯伯绾块珮" )
@Column(name = "cnzlxg", precision = 20, scale = 6)
- private double cnzlxg;
+ private Double cnzlxg;
@PropertyDef(label = "绛掍粨鍐呭緞" )
@Column(name = "tcnj", precision = 20, scale = 6)
- private double tcnj;
+ private Double tcnj;
@PropertyDef(label = "浠撳唴浣撶Н" )
@Column(name = "cntj", precision = 20, scale = 6)
- private double cntj;
+ private Double cntj;
@PropertyDef(label = "浠撻棬鏁伴噺" )
@Column(name = "cmsl")
@@ -149,11 +135,11 @@
@PropertyDef(label = "浠撻棬楂樺害" )
@Column(name = "cmgd", precision = 20, scale = 6)
- private double cmgd;
+ private Double cmgd;
@PropertyDef(label = "浠撻棬瀹藉害" )
@Column(name = "cmkd", precision = 20, scale = 6)
- private double cmkd;
+ private Double cmkd;
@PropertyDef(label = "鎸＄伯闂ㄥ瀷寮�" )
@Column(name = "dlmxs", length = 2)
@@ -249,11 +235,11 @@
@PropertyDef(label = "浠撴埧缁忓害" )
@Column(name = "jd", precision = 20, scale = 6)
- private double jd;
+ private Double jd;
@PropertyDef(label = "浠撴埧绾害" )
@Column(name = "wd", precision = 20, scale = 6)
- private double wd;
+ private Double wd;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
@@ -261,10 +247,29 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "寤掗棿鏁�")
+ @Column(name = "ajs")
+ private Integer ajs;
+ @PropertyDef(label = "鏍囪浣�")
+ @Column(name = "bjw", length = 40)
+ private String bjw;
+
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
}
--
Gitblit v1.9.3