From b3e5616f2f02092c86d9b2b3d2da58a221bec59f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 10:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
index a726f15..e2ea779 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
@@ -1,6 +1,7 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
import java.util.Date;
@@ -9,11 +10,7 @@
* 鎵ц璁板綍
**/
@Data
-public class DDeductionDto{
-
- private Date startTime;
- private Date endTime;
- private String keyWord;
+public class DDeductionDto extends DCommonDto {
private Integer status;
private String shopId;
private String departmentCode;
--
Gitblit v1.8.0