From 8e095a4a2e882e31836e98742bf4f408233bd351 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:05 +0800
Subject: [PATCH] 上海对农数据接口调整

---
 src/main/java/com/fzzy/api/entity/Api1308.java |   70 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/Api1308.java b/src/main/java/com/fzzy/api/entity/Api1308.java
index e43284f..5132986 100644
--- a/src/main/java/com/fzzy/api/entity/Api1308.java
+++ b/src/main/java/com/fzzy/api/entity/Api1308.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.annotation.JSONField;
 import com.bstek.dorado.annotation.PropertyDef;
 import lombok.Data;
-import org.hibernate.annotations.GenericGenerator;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
@@ -24,34 +23,50 @@
      */
     private static final long serialVersionUID = 1L;
 
+    /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
     @Id
     @JSONField(serialize = false)
     @Column(name = "ID_", length = 40)
     private String id;
 
+    @PropertyDef(label = "鏂囦欢鍦板潃")
+    @Column(name = "wjdz")
+    @JSONField(serialize = false)
+    private String wjdz;
+
+    @JSONField(serialize = false)
+    @PropertyDef(label = "涓氬姟id")
+    @Column(name = "bizId", length = 40)
+    private String bizId;
+
+    /*----------鍥芥爣瀛楁----------*/
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "鍛婅鏃堕棿" )
-    @Column(name = "gjsj", nullable = false)
+    @Column(name = "gjsj")
     private Date gjsj;
 
     @PropertyDef(label = "搴撳尯鍚嶇О" )
-    @Column(name = "kqmc", length = 64, nullable = false)
+    @Column(name = "kqmc", length = 64)
     private String kqmc;
 
     @PropertyDef(label = "搴撳尯浠g爜" )
-    @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 = "kqdz", length = 256)
     private String kqdz;
 
     @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
-    @Column(name = "spjksbid", length = 20, nullable = false)
+    @Column(name = "spjksbid", length = 20)
     private String spjksbid;
 
     @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷" )
-    @Column(name = "azwzlx", length = 2, nullable = false)
+    @Column(name = "azwzlx", length = 2)
     private String azwzlx;
 
     @PropertyDef(label = "鐩戣鍖哄煙璇存槑" )
@@ -59,38 +74,41 @@
     private String jsqysm;
 
     @PropertyDef(label = "寮傚父鍛婅璇存槑" )
-    @Column(name = "ycgjsm", length = 1024, nullable = false)
+    @Column(name = "ycgjsm", length = 1024)
     private String ycgjsm;
 
-    @PropertyDef(label = "鏂囦欢id")
-    @Column(name = "fileStorageId", length = 20)
-    private String fileStorageId;
+    @PropertyDef(label = "瑙嗛鏂囦欢娴�" )
+    @Column(name = "spwjl", length = 1024)
+    private String spwjl;
 
     @PropertyDef(label = "瑙嗛鏂囦欢鍚庣紑鍚�")
     @Column(name = "spwjhzm", length = 5)
     private String spwjhzm;
 
-    @PropertyDef(label = "瑙嗛鏂囦欢娴�" )
-    @Column(name = "spwjl", length = 1024, nullable = false)
-    private String spwjl;
-
-    @PropertyDef(label = "鏂囦欢鍦板潃")
-    @Column(name = "wjdz")
-    @JSONField(serialize = false)
-    private String wjdz;
-
     @PropertyDef(label = "鎿嶄綔鏍囧織" )
-    @Column(name = "czbz", length = 1, nullable = false)
+    @Column(name = "czbz", length = 1)
     private String czbz;
-
-    @JSONField(serialize = false)
-    @PropertyDef(label = "涓氬姟id")
-    @Column(name = "bizId", length = 40)
-    private String bizId;
 
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
-    @Column(name = "zhgxsj", nullable = false)
+    @Column(name = "zhgxsj")
     private Date zhgxsj;
 
+    /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+    @PropertyDef(label = "鏂囦欢id")
+    @Column(name = "fileStorageId", length = 20)
+    private String fileStorageId;
+
+    /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+    @PropertyDef(label = "璐т綅浠g爜")
+    @Column(name = "hwdm", length = 30)
+    private String hwdm;
+
+    @PropertyDef(label = "鍥惧儚缂栧彿", description = "鏂囦欢淇℃伅鎺ュ彛涓殑鏂囦欢鍚嶇О")
+    @Column(name = "txbh", length = 100)
+    private String txbh;
+
+    @PropertyDef(label = "瑙嗛缂栧彿", description = "鏂囦欢淇℃伅鎺ュ彛涓殑鏂囦欢鍚嶇О")
+    @Column(name = "spbh", length = 100)
+    private String spbh;
 }

--
Gitblit v1.9.3