From 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 六月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
index b2d0808..fbba802 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
@@ -1,17 +1,14 @@
package com.hz.phis.dt.card;
-import com.hz.his.dto.PageDto;
+import lombok.Data;
-public class CardDt extends PageDto {
- /**鏇存柊鏃堕棿*/
- private String editTime;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
+/**
+ * 鍗￠」鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardDt {
+ private CardDetailListDt cardItem;
}
--
Gitblit v1.8.0