From 0990d6a1dcb89d6b254ea0b8978553356b729f5e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 28 十月 2024 23:36:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
index f788b6c..955de45 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -2,10 +2,7 @@
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 java.io.Serializable;
import java.util.Date;
@@ -13,7 +10,6 @@
* 鎺ュ彛琛�-璐т綅淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1105 implements Serializable {
/**
@@ -27,6 +23,9 @@
@PropertyDef(label = "璐т綅鍚嶇О")
private String hwmc;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
@@ -35,7 +34,7 @@
private Date hwqyrq;
@PropertyDef(label = "璐т綅瀹归噺")
- private double hwrl;
+ private Double hwrl;
@PropertyDef(label = "淇濈鍗曚綅")
private String bgdw;
@@ -46,6 +45,9 @@
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
+ @PropertyDef(label = "璐т綅鐘舵��")
+ private String hwzt;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
--
Gitblit v1.9.3