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/SH2023Api1108.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
index 378d94f..2ea83ae 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
@@ -24,14 +24,15 @@
*/
private static final long serialVersionUID = -7131774374918644731L;
+ @PropertyDef(label = "鑽墏缂栧彿")
+ private String yjbh;
@PropertyDef(label = "搴撳尯浠ｇ爜")
- @Column(name = "kqdm", length = 21)
private String kqdm;
- @PropertyDef(label = "鑽墏缂栧彿")
- @Column(name = "yjbh", length = 50)
- private String yjbh;
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date cgrq;
@PropertyDef(label = "鑽墏鍚嶇О")
private String yjmc;
@@ -64,12 +65,7 @@
private String czclfs;
@PropertyDef(label = "淇濊川鏈�")
- @JSONField(format = "yyyy-MM-dd")
- private Date bzq;
-
- @PropertyDef(label = "閲囪喘鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date cgrq;
+ private String bzq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
private Double kcsl;
--
Gitblit v1.9.3