From fc3a12040d6ec88f99c2a4cbe2afb16215ac5ae4 Mon Sep 17 00:00:00 2001 From: Andru <769883346@qq.com> Date: 星期三, 13 十二月 2023 10:48:02 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 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 1de6fbf..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; /**寮�鍗曠粨鏉熸椂闂�*/ @@ -25,12 +27,20 @@ private String userInviteeName; /**鎵�灞炲挩璇㈠笀*/ private String userCorpUserName; - /**鎵�灞為棬搴�*/ - private String userShopName; /**鍟嗗搧鍚嶇О*/ private String goodsName; - - + /**璁㈠崟鎵�灞為棬搴�*/ + 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