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/gd2022/dto/Gd2022Api1101.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
index cb39200..5a6bbaf 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java
@@ -3,11 +3,9 @@
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.Id;
import java.io.Serializable;
import java.util.Date;
@@ -18,12 +16,12 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class Gd2022Api1101 extends ApiParent implements Serializable {
+public class Gd2022Api1101 implements Serializable {
/**
*
*/
private static final long serialVersionUID = 9157617424050247565L;
- @Id
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
@@ -40,10 +38,10 @@
private Date zcrq;
@PropertyDef(label = "娉ㄥ唽璧勬湰")
- private double zczb;
+ private Double zczb;
@PropertyDef(label = "璧勪骇鎬婚")
- private double zcze;
+ private Double zcze;
@PropertyDef(label = "娉曞畾浠ｈ〃浜�")
private String fddbr;
@@ -78,10 +76,6 @@
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
private String xzqhdm;
- @JSONField(serialize = false)
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- private String xzqhmc;
-
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
private String sjdwmc;
@@ -98,10 +92,10 @@
private Integer ygs;
@PropertyDef(label = "缁忓害")
- private double jd;
+ private Double jd;
@PropertyDef(label = "绾害")
- private double wd;
+ private Double wd;
@PropertyDef(label = "澶囨绫诲瀷")
private String balx;
--
Gitblit v1.9.3