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/report/DeductionSurfaceDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
index cb909f0..27b5038 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
private Date endTime;
+ /**璁㈠崟鏀粯寮�濮�*/
+ private Date orderPayStartTime;
+ /**璁㈠崟鏀粯缁撴潫*/
+ private Date orderPayEndTime;
/**璁㈠崟鍙�*/
private String orderNo;
/**鎵�灞為棬搴�*/
@@ -24,6 +28,14 @@
private Integer deductionStatus;
/**椤圭洰鍒嗙被*/
private String typeId;
+ /**鍝侀」鍒嗙被*/
+ private String goodsClassify;
+ /**鏈堜唤鏃堕棿*/
+ private String monthTime;
+ /**鏈堜唤鏃堕棿寮�濮�*/
+ private String startMonthTime;
+ /**鏈堜唤鏃堕棿缁撴潫*/
+ private String endMonthTime;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
--
Gitblit v1.8.0