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/Api1205.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index 0d51549..799a3d0 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -26,16 +26,10 @@
*/
private static final long serialVersionUID = -6381473449862569451L;
-
public static String SORT_PROP = "ckywdh";
-
- @JSONField(serialize = false)
- @Id
- @Column(name = "id", length = 40)
- private String id;
-
//涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠ｈ〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
+ @Id
@PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
@Column(name = "ckywdh", length = 12)
private String ckywdh;
@@ -43,6 +37,10 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
@Column(name = "hwdm", length = 30)
private String hwdm;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ @Column(name = "jhmxh", length = 50)
+ private String jhmxh;
@PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
@Column(name = "cktzdh", length = 32)
@@ -122,6 +120,10 @@
@Column(name = "cddm", length = 6)
private String cddm;
+ @PropertyDef(label = "妫�鏂ょ被鍨�", description = "0锛氱О閲嶅叆搴擄紙榛樿锛�1锛氭爣鍑嗗寘鍏ュ簱")
+ @Column(name = "jjlx", length = 1)
+ private String jjlx = "0";
+
@PropertyDef(label = "鐨噸(鍏枻)")
@Column(name = "pz", precision = 20, scale = 6)
private double pz;
--
Gitblit v1.9.3