From 0cf0ceb7efe3edaba0cbb3f90f028db0de108abf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 29 十月 2025 17:19:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/entity/Api1201.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1201.java b/src/main/java/com/fzzy/api/entity/Api1201.java
index 2943651..1933f9e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1201.java
+++ b/src/main/java/com/fzzy/api/entity/Api1201.java
@@ -46,9 +46,17 @@
@Column(name = "dwdm", length = 18)
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ @Column(name = "tydwbm", length = 20)
+ private String tydwbm;
+
@PropertyDef(label = "涓氬姟绫诲埆")
@Column(name = "ywlx", length = 1)
private String ywlx;
+
+ @PropertyDef(label = "鍚堝悓绉嶇被" ,description = "1:閿�鍞悎鍚�,2:閲囪喘鍚堝悓,3锛氬鎵樻敹鍌ㄥ悎鍚�,4锛氬鎵樻敹璐悎鍚�")
+ @Column(name = "htzl", length = 1)
+ private String htzl;
@PropertyDef(label = "瀹㈡埛绫诲瀷")
@Column(name = "khlx", length = 1)
@@ -92,13 +100,17 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绛捐鏃ユ湡")
- @Column(name = "qdrq", length = 10)
+ @Column(name = "qdrq")
private Date qdrq;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
@Column(name = "ydwcsj")
private Date ydwcsj;
+
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ @Column(name = "ysfs", length = 64)
+ private String ysfs;
@PropertyDef(label = "绛捐鍦扮偣")
@Column(name = "qddd", length = 512)
@@ -125,8 +137,18 @@
@Column(name = "htzje", precision = 20, scale = 6)
private BigDecimal htzje;
+ /**
+ * 1锛氬叏棰濆厛娆惧悗璐�
+ * 2锛氭寜鍒版杩涘害閫愭壒鍙戣揣
+ * 3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�
+ * 4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻
+ */
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ @Column(name = "fkfs", length = 1)
+ private String fkfs;
+
@PropertyDef(label = "灞ョ害淇濊瘉閲�")
- @Column(name = "lybzj")
+ @Column(name = "lybzj", precision = 20, scale = 6)
private double lybzj;
@JSONField(format = "yyyy-MM-dd")
@@ -136,22 +158,22 @@
@JSONField(name = "Lysl")
@PropertyDef(label = "灞ョ害鏁伴噺")
- @Column(name = "lysl")
+ @Column(name = "lysl", precision = 20, scale = 6)
private double lysl;
@JSONField(name = "Lyl")
@PropertyDef(label = "灞ョ害鐜�")
- @Column(name = "lyl")
+ @Column(name = "lyl", precision = 20, scale = 6)
private double lyl;
@JSONField(name = "Jsjg")
@PropertyDef(label = "缁撶畻浠锋牸")
- @Column(name = "jsjg")
+ @Column(name = "jsjg", precision = 20, scale = 6)
private double jsjg;
- @JSONField(name = "Jszje",serializeUsing = NumberSerializer.class)
+ @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class)
@PropertyDef(label = "缁撶畻鎬婚噾棰�")
- @Column(name = "jszje")
+ @Column(name = "jszje", precision = 20, scale = 6)
private BigDecimal jszje;
@PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
@@ -222,4 +244,8 @@
@PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
@Column(name = "syncTime")
private Date syncTime;
+
+ @PropertyDef(label = "杞崲骞村害", description = "鐩墠涓婃捣浣跨敤")
+ @Column(name = "lhnd")
+ private String lhnd;
}
--
Gitblit v1.9.3