From ed43bd0e7f5520f227c329ef436adb1e278016a7 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 11 十月 2023 11:56:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 a7893c9..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,8 +13,12 @@
 @Data
 public class ClinicPerfReqDto extends BaseQueryVo{
 
-    /** 闂ㄥ簵id */
+    /** 鎵�灞為棬搴梚d */
     private String shopId;
+    /** 璁㈠崟闂ㄥ簵 */
+    private String orderShopId;
+    /** 鏀堕摱闂ㄥ簵*/
+    private String cashierShopId;
     /** 寮�濮嬫椂闂� */
     private String startTime;
     /** 缁撴潫鏃堕棿 */
@@ -25,4 +31,8 @@
     private String operatorId;
     /** 鎿嶄綔浜� */
     private String operatorName;
+    /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+    private Integer isFilterTestAccount;
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
 }

--
Gitblit v1.8.0