From e3fe83d7676c8f954564a7fb90e82295b3da2fee Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 26 九月 2023 16:31:16 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java index 6c6b5f3..f223034 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java @@ -3,6 +3,8 @@ import lombok.Data; +import java.util.List; + /** * 璇婃墍鐜伴噾涓氱哗VO * @USER: fhx @@ -11,12 +13,12 @@ @Data public class ClinicPerfReqDto extends BaseQueryVo{ - /** 闂ㄥ簵id */ + /** 鎵�灞為棬搴梚d */ private String shopId; - /** 鏀堕摱闂ㄥ簵 */ + /** 璁㈠崟闂ㄥ簵 */ + private String orderShopId; + /** 鏀堕摱闂ㄥ簵*/ private String cashierShopId; - /** 鎵�灞為棬搴�*/ - private String userShopId; /** 寮�濮嬫椂闂� */ private String startTime; /** 缁撴潫鏃堕棿 */ @@ -29,4 +31,8 @@ private String operatorId; /** 鎿嶄綔浜� */ private String operatorName; + /**鏄惁杩囨护娴嬭瘯璐﹀彿*/ + private Integer isFilterTestAccount; + /**涓氱哗绫诲瀷*/ + private List<Integer> sourceTypeList; } -- Gitblit v1.8.0