From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/entity/Api1202.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index 8ebb43d..e51a1fd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -29,14 +29,18 @@
//12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
@Id
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
- @Column(name = "rkywdh", length = 12, nullable = false)
+ @Column(name = "rkywdh", length = 12)
private String rkywdh;
@PropertyDef(label = "璐т綅浠ｇ爜")
- @Column(name = "hwdm", length = 30, nullable = false)
+ @Column(name = "hwdm", length = 30)
private String hwdm;
- @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ @Column(name = "tyhwbm", length = 28)
+ private String tyhwbm;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�;3:绉诲簱鍌ㄥ瓨鍏ュ簱")
@Column(name = "ywlx", length = 1)
private String ywlx = "2";
@@ -57,6 +61,10 @@
@Column(name = "lqgsdwdm", length = 18)
private String lqgsdwdm;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ @Column(name = "lqgsdwtybm", length = 18)
+ private String lqgsdwtybm;
+
@PropertyDef(label = "鎵胯繍浜�")
@Column(name = "cyr", length = 64)
private String cyr;
--
Gitblit v1.9.3