From 9574cd990b7e32f966edc45824f8f952b5215d58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 18 七月 2023 19:58:49 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 8 ++++----
1 files changed, 4 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..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 cashierShopId;
- /** 鎵�灞為棬搴�*/
- private String userShopId;
/** 寮�濮嬫椂闂� */
private String startTime;
/** 缁撴潫鏃堕棿 */
--
Gitblit v1.8.0