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/SH2023Api2104.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
index 9d9b785..9a402ea 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
@@ -23,11 +22,14 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "璁拌处鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date jzrq;
- @PropertyDef(label = "瀹㈡埛缂栧彿")
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
private String khmc;
@PropertyDef(label = "鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿")
@@ -56,7 +58,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date zhgxsh;
+ private Date zhgxsj;
@PropertyDef(label = "鎵规鍙�")
private String pch;
--
Gitblit v1.9.3