From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 12 +++++++++---
1 files changed, 9 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..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,12 +13,12 @@
@Data
public class ClinicPerfReqDto extends BaseQueryVo{
- /** 鏀堕摱闂ㄥ簵id */
+ /** 鎵�灞為棬搴梚d */
private String shopId;
/** 璁㈠崟闂ㄥ簵 */
private String orderShopId;
- /** 鎵�灞為棬搴�*/
- private String userShopId;
+ /** 鏀堕摱闂ㄥ簵*/
+ private String cashierShopId;
/** 寮�濮嬫椂闂� */
private String startTime;
/** 缁撴潫鏃堕棿 */
@@ -29,4 +31,8 @@
private String operatorId;
/** 鎿嶄綔浜� */
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
}
--
Gitblit v1.8.0