From 345743e67e70b4ccc7462589956c28dd9874a132 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 29 六月 2023 10:32:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 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