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/SH2023Api1104.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
index ecd26f4..23ab0ed 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -2,25 +2,17 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-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
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1104 implements Serializable {
/**
@@ -38,16 +30,16 @@
private String cfdm;
@PropertyDef(label = "寤掗棿闀垮害")
- private double ajcd;
+ private Double ajcd;
@PropertyDef(label = "寤掗棿瀹藉害")
- private double ajkd;
+ private Double ajkd;
@PropertyDef(label = "寤掗棿楂樺害")
- private double ajgd;
+ private Double ajgd;
@PropertyDef(label = "寤掗棿璁捐浠撳")
- private double ajsjcr;
+ private Double ajsjcr;
@PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
private String ajlxdh;
@@ -55,6 +47,9 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
private Date ajqyrq;
+
+ @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
+ private String sykqdm;
@PropertyDef(label = "寤掗棿鐘舵��")
private String ajzt;
@@ -66,11 +61,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
- private String sykqdm;
-
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
--
Gitblit v1.9.3