From 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 九月 2023 10:23:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
index 5cdfa70..d5e1f38 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
@@ -17,7 +18,7 @@
* @date 2023-08-21
*/
@Data
-public class SH2023Api2103 extends ApiParent implements Serializable {
+public class SH2023Api2103 implements Serializable {
private static final long serialVersionUID = 9157617424050247565L;
@@ -66,11 +67,15 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
@Transient
+ @JsonIgnore
private List<SH2023Api2103Item> sh2023Api2103Items;
}
\ No newline at end of file
--
Gitblit v1.9.3