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/Api1206.java |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/Api1206.java b/src/main/java/com/fzzy/api/entity/Api1206.java
index e69e220..b8704c4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1206.java
+++ b/src/main/java/com/fzzy/api/entity/Api1206.java
@@ -4,6 +4,7 @@
 import com.bstek.dorado.annotation.PropertyDef;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -19,16 +20,16 @@
 @Table(name = "API_1206")
 @EqualsAndHashCode(callSuper = false)
 public class Api1206 implements Serializable {
-	
-	public static String SORT_PROP = "ckjsdh";
+
+    public static String SORT_PROP = "ckjsdh";
 
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = -8778664614878279565L;
+     *
+     */
+    private static final long serialVersionUID = -8778664614878279565L;
 
-	@Id
-    @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
+    @Id
+    @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
     @Column(name = "ckjsdh", length = 33)
     private String ckjsdh;
 
@@ -36,56 +37,60 @@
     @Column(name = "tydwbm", length = 20)
     private String tydwbm;
 
-    @PropertyDef(label = "鍚堝悓鍙�" )
+    @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+    @Column(name = "tykqbm", length = 22)
+    private String tykqbm;
+
+    @PropertyDef(label = "鍚堝悓鍙�")
     @Column(name = "hth", length = 64)
     private String hth;
 
-    @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)" )
+    @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
     @Column(name = "jssl", precision = 20, scale = 6)
     private double jssl;
 
-    @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)" )
+    @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
     @Column(name = "jsdj", precision = 20, scale = 6)
     private double jsdj;
 
-    @PropertyDef(label = "缁撶畻閲戦(鍏�)" )
+    @PropertyDef(label = "缁撶畻閲戦(鍏�)")
     @Column(name = "jsje", precision = 20, scale = 6)
     private double jsje;
 
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @PropertyDef(label = "缁撶畻鏃堕棿" )
+    @PropertyDef(label = "缁撶畻鏃堕棿")
     @Column(name = "jssj")
     private Date jssj;
 
-    @PropertyDef(label = "缁撶畻鏂瑰紡" )
+    @PropertyDef(label = "缁撶畻鏂瑰紡")
     @Column(name = "jsfs", length = 1)
     private String jsfs;
 
-    @PropertyDef(label = "浠樻浜�" )
+    @PropertyDef(label = "浠樻浜�")
     @Column(name = "fkr", length = 256)
     private String fkr;
 
-    @PropertyDef(label = "閾惰琛屽埆浠g爜" )
+    @PropertyDef(label = "閾惰琛屽埆浠g爜")
     @Column(name = "yhhbdm", length = 3)
     private String yhhbdm;
 
-    @PropertyDef(label = "寮�鎴疯鍙�" )
+    @PropertyDef(label = "寮�鎴疯鍙�")
     @Column(name = "khhh", length = 32)
     private String khhh;
 
-    @PropertyDef(label = "寮�鎴疯鍚嶇О" )
+    @PropertyDef(label = "寮�鎴疯鍚嶇О")
     @Column(name = "khhmc", length = 128)
     private String khhmc;
 
-    @PropertyDef(label = "閾惰璐﹀彿" )
+    @PropertyDef(label = "閾惰璐﹀彿")
     @Column(name = "yhzh", length = 32)
     private String yhzh;
 
-    @PropertyDef(label = "鍙戠エ鍙风爜" )
+    @PropertyDef(label = "鍙戠エ鍙风爜")
     @Column(name = "fphm", length = 10)
     private String fphm;
 
-    @PropertyDef(label = "鍙戠エ鐘舵��" )
+    @PropertyDef(label = "鍙戠エ鐘舵��")
     @Column(name = "fpzt", length = 1)
     private String fpzt;
 

--
Gitblit v1.9.3