From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:45:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java | 71 ++++++++---------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
index 5d797f3..ff92803 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -3,22 +3,15 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
* 鎺ュ彛琛�-鍗曚綅
*
- * @author chen
+ * @author czt
* @date 2022-09-02 14:18
*/
@Data
@@ -36,8 +29,6 @@
private String dwlx;
@PropertyDef(label = "娉ㄥ唽鏃ユ湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@JSONField(format = "yyyy-MM-dd")
private Date zcrq;
@@ -66,13 +57,16 @@
private String zcdz;
@PropertyDef(label = "鐢靛瓙閭")
- private String dzyx;
+ @JSONField(serialize = true)
+ private String dzyx = "鏃�";
@PropertyDef(label = "浼佷笟瀹樻柟缃戠珯鍦板潃")
- private String qygfwzdz;
+ @JSONField(serialize = true)
+ private String qygfwzdz = "鏃�";
@PropertyDef(label = "浼犵湡鍙风爜")
- private String czhm;
+ @JSONField(serialize = true)
+ private String czhm = "鏃�";
@PropertyDef(label = "閭斂缂栫爜")
private String yzbm;
@@ -80,21 +74,22 @@
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
private String xzqhdm;
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- @JSONField(serialize = false)
- private String xzqhmc;
-
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
- private String sjdwmc;
+ @JSONField(serialize = true)
+ private String sjdwmc = "鏃�";
@PropertyDef(label = "涓婄骇鍗曚綅浠ｇ爜")
- private String sjdwdm;
+ @JSONField(serialize = true)
+ private String sjdwdm = "鏃�";
@PropertyDef(label = "搴撳尯鏁�")
private Integer kqs;
@PropertyDef(label = "浠撴埧鏁�")
private Integer cfs;
+
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
@PropertyDef(label = "娌圭綈鏁�")
private Integer ygs;
@@ -105,45 +100,13 @@
@PropertyDef(label = "绾害")
private double wd;
- @PropertyDef(label = "鍗曚綅鐘舵��")
- private String dwzt;
-
- @PropertyDef(label = "澶囨绫诲瀷", description = "0:鍒濇澶囨 1:鍙樻洿澶囨 2:閲嶆柊澶囨")
- private String balx;
-
- @PropertyDef(label = "浠撳偍涓氬姟绫诲瀷")
- private String ccywlx;
-
- @PropertyDef(label = "浠撳偍鍝佺")
- private String ccpz;
-
- @PropertyDef(label = "澶囨鐘舵��")
- private String bazt;
-
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
-
- @PropertyDef(label = "寤掗棿鏁�")
- private Integer ajs;
-
- @PropertyDef(label = "鏍囪浣�")
- private String bjw;
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- private String bizId;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
- private Date syncTime;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
-
-
-}
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
+}
\ No newline at end of file
--
Gitblit v1.9.3