From ee12f2e9d0a8bbeab9627cbc79f04030365f06b7 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 09 五月 2023 19:02:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-prod-new-优惠券校验 --- phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java index 720798c..12f1a2c 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java @@ -10,7 +10,8 @@ **/ @Data public class CashierSettlementDto extends BaseQueryVo{ - + /**鏄惁鍗曢〉杩斿洖*/ + private Integer selectReturn = 0; /**寮�鍗曞紑濮嬫椂闂�*/ private Date startTime; /**寮�鍗曠粨鏉熸椂闂�*/ -- Gitblit v1.8.0