From ba3d341a187b36ea5b9ed3266930d567c4774fcc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 11:18:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java |    6 +++++-
 1 files changed, 5 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..bb999f1 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
@@ -11,8 +11,12 @@
 @Data
 public class ClinicPerfReqDto extends BaseQueryVo{
 
-    /** 闂ㄥ簵id */
+    /** 鎵�灞為棬搴梚d */
     private String shopId;
+    /** 璁㈠崟闂ㄥ簵 */
+    private String orderShopId;
+    /** 鏀堕摱闂ㄥ簵*/
+    private String cashierShopId;
     /** 寮�濮嬫椂闂� */
     private String startTime;
     /** 缁撴潫鏃堕棿 */

--
Gitblit v1.8.0