From 827d118f2923861f2aa8871b722f8d104c637a6e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 14 八月 2023 15:55:34 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
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