From 2adc60ff9912923be2b59242dda1a77851dd8b5c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 28 八月 2023 11:06:33 +0800
Subject: [PATCH] Merge branch 'rx-0814-开单项目' into master-prod-new

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

--
Gitblit v1.8.0