From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
index efd6d47..c86d196 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.promotion;
+import com.hz.his.dto.PageDto;
import lombok.Data;
/**
@@ -7,7 +8,7 @@
* @author fwq
* */
@Data
-public class PromotionDto {
+public class PromotionDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
--
Gitblit v1.8.0