From 034add97ea4cb999da850f1c597a76d0b49b920a Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 15 八月 2023 19:33:12 +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 | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 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 ff0710c..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; /**鎵�灞為棬搴�*/ @@ -21,9 +25,17 @@ /**鎵�灞炲挩璇㈠笀*/ private String hisCorpName; /**鐘舵��:0鍙栨秷1杩囨湡2鏃犳晥3鍒掓墸瀹屾垚4鏈垝鎵�5鍒掓墸涓�*/ - private Integer dStatus; + private Integer deductionStatus; /**椤圭洰鍒嗙被*/ private String typeId; + /**鍝侀」鍒嗙被*/ + private String goodsClassify; + /**鏈堜唤鏃堕棿*/ + private String monthTime; + /**鏈堜唤鏃堕棿寮�濮�*/ + private String startMonthTime; + /**鏈堜唤鏃堕棿缁撴潫*/ + private String endMonthTime; /*******淇濆瓨鍙傛暟********/ /**鎿嶄綔浜烘爣璇�*/ -- Gitblit v1.8.0