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/Api1301.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index 52c407c..aa949ef 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -25,9 +25,9 @@
private static final long serialVersionUID = 1L;
@Id
- @JSONField(serialize = false)
- @Column(name = "ID_",length = 40)
- private String id;
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
+ @Column(name = "fxdbm", length = 18)
+ private String fxdbm;
@JSONField(serialize = false)
@PropertyDef(label = "涓氬姟id", description = "鎺ュ彛杩斿洖涓嶆秹鍙婃瀛楁")
@@ -35,80 +35,84 @@
private String bizId;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
- @Column(name = "kqdm", length = 21, nullable = false)
+ @Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @Column(name = "tykqbm", length = 22)
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ @Column(name = "tydwbm", length = 20)
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
- @Column(name = "dwdm", length = 18, nullable = false)
+ @Column(name = "dwdm", length = 18)
private String dwdm;
@PropertyDef(label = "搴撳尯鍚嶇О" )
- @Column(name = "kqmc", length = 256, nullable = false)
+ @Column(name = "kqmc", length = 256)
private String kqmc;
@PropertyDef(label = "鍦扮偣" )
- @Column(name = "dd", length = 128, nullable = false)
+ @Column(name = "dd", length = 128)
private String dd;
- @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
- @Column(name = "fxdbm", length = 18, nullable = false)
- private String fxdbm;
-
@PropertyDef(label = "璇嗗埆浜�" )
- @Column(name = "sbr", length = 32, nullable = false)
+ @Column(name = "sbr", length = 32)
private String sbr;
@PropertyDef(label = "鐜妭/閮ㄤ綅" )
- @Column(name = "hjbw", length = 128, nullable = false)
+ @Column(name = "hjbw", length = 128)
private String hjbw;
@PropertyDef(label = "椋庨櫓淇℃伅" )
- @Column(name = "fxxx", length = 256, nullable = false)
+ @Column(name = "fxxx", length = 256)
private String fxxx;
@PropertyDef(label = "椋庨櫓绫诲瀷" )
- @Column(name = "fxlx", length = 1, nullable = false)
+ @Column(name = "fxlx", length = 1)
private String fxlx;
@PropertyDef(label = "椋庨櫓鍒嗙骇" )
- @Column(name = "fxfj", length = 1, nullable = false)
+ @Column(name = "fxfj", length = 1)
private String fxfj;
@PropertyDef(label = "椋庨櫓绠℃帶鎺柦" )
- @Column(name = "fxglcs", length = 1000, nullable = false)
+ @Column(name = "fxglcs", length = 1000)
private String fxglcs;
- @JSONField(name = "Yhxx")
@PropertyDef(label = "闅愭偅淇℃伅" )
- @Column(name = "yhxx", length = 256, nullable = false)
+ @Column(name = "yhxx", length = 256)
private String yhxx;
@PropertyDef(label = "闅愭偅鎺掓煡淇℃伅" )
- @Column(name = "yhpcxx", length = 1000, nullable = false)
+ @Column(name = "yhpcxx", length = 1000)
private String yhpcxx;
@PropertyDef(label = "闅愭偅鏁存敼淇℃伅" )
- @Column(name = "yhzgxx", length = 1000, nullable = false)
+ @Column(name = "yhzgxx", length = 1000)
private String yhzgxx;
@PropertyDef(label = "闅愭偅鏁存敼楠屾敹淇℃伅" )
- @Column(name = "yhysxx", length = 1000, nullable = false)
+ @Column(name = "yhysxx", length = 1000)
private String yhysxx;
@PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅" )
- @Column(name = "sgjbxx", length = 1000, nullable = false)
+ @Column(name = "sgjbxx", length = 1000)
private String sgjbxx;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺" )
- @Column(name = "zgsx", length = 10)
- private String zgsx;
+ @Column(name = "zgsx")
+ private Date zgsx;
@PropertyDef(label = "璐ｄ换鍗曚綅" )
- @Column(name = "zrdw", length = 128, nullable = false)
+ @Column(name = "zrdw", length = 128)
private String zrdw;
@PropertyDef(label = "璐ｄ换浜�" )
- @Column(name = "zrr", length = 32, nullable = false)
+ @Column(name = "zrr", length = 32)
private String zrr;
@PropertyDef(label = "鏁存敼楠屾敹淇℃伅" )
@@ -116,16 +120,16 @@
private String zgysxx;
@PropertyDef(label = "椋庨櫓璺熻釜鐩戠璐ｄ换浜�" )
- @Column(name = "fxgzjgzrr", length = 32, nullable = false)
+ @Column(name = "fxgzjgzrr", length = 32)
private String fxgzjgzrr;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
--
Gitblit v1.9.3