From 1468baceb9b0f168a76b999dcf9e724c49d100c8 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期五, 23 二月 2024 17:40:45 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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..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 @@ -4,13 +4,15 @@ import lombok.Data; import java.util.Date; +import java.util.List; /** * 鍒掓墸 **/ @Data public class CashierSettlementDto extends BaseQueryVo{ - + /**鏄惁鍗曢〉杩斿洖*/ + private Integer selectReturn = 0; /**寮�鍗曞紑濮嬫椂闂�*/ private Date startTime; /**寮�鍗曠粨鏉熸椂闂�*/ @@ -31,7 +33,14 @@ private String shopId; /**瀹㈡埛鎵�灞為棬搴�*/ private String userShopId; - + /**閿�鍞钩鍙�*/ + private String sourceName; + /**鏄惁杩囨护娴嬭瘯璐﹀彿*/ + private Integer isFilterTestAccount; + /**鏄惁杩囨护瀵瑰啿鏁版嵁*/ + private Integer isHedging; + /**涓氱哗绫诲瀷*/ + private List<Integer> sourceTypeList; /*******淇濆瓨鍙傛暟********/ /**鎿嶄綔浜烘爣璇�*/ private String operatorId; -- Gitblit v1.8.0