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 | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index 20404f8..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 = "寤鸿鍗曚綅" )
@@ -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