From 2438c8e6950ba4f1557e4de62ae8191150d9e213 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 17 十一月 2023 16:53:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1116-营销生日券' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2 ++
1 files changed, 2 insertions(+), 0 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 d5ee25f..cee6e84 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
@@ -37,6 +37,8 @@
private String sourceName;
/**鏄惁杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
/**涓氱哗绫诲瀷*/
private List<Integer> sourceTypeList;
/*******淇濆瓨鍙傛暟********/
--
Gitblit v1.8.0