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/push/sh2023/dto/SH2023Api1112.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
index d20afe9..89da6c2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -21,13 +16,8 @@
*
*/
private static final long serialVersionUID = -6628887714024258654L;
-
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
-
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
-
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@@ -46,6 +36,9 @@
@PropertyDef(label = "鎬у埆")
private String xb;
+
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
@@ -82,6 +75,9 @@
@PropertyDef(label = "涓撲笟")
private String zy;
+ @PropertyDef(label = "鏈�楂樿亴绉�")
+ private String zgzc = "鏃�";
+
@PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
@JSONField(format = "yyyy-MM-dd")
private Date qdzgzchzyzgsj;
@@ -92,6 +88,13 @@
@PropertyDef(label = "鑱屽姟")
private String zw;
+ @PropertyDef(label = "鑽ｈ獕绉板彿")
+ private String rych = "鏃�";
+
+ @PropertyDef(label = "鍙栧緱鑽ｈ獕绉板彿鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hdrychsj;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -101,6 +104,5 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
--
Gitblit v1.9.3