From 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 六月 2024 17:07:33 +0800
Subject: [PATCH] Merge branch 'master-fwq-团购提前扣取金额' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index 5a07d54..04e5f53 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -5,16 +5,43 @@
import java.util.List;
/**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鎶ヨ〃鎵╁睍
* @author fwq
* */
@Data
public class UserReportDto {
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+
+ /**杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/**鍛樺伐鏍囪瘑*/
private String userId;
/**寮�濮嬫椂闂�*/
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
-
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**绉戝鏍囪瘑*/
+ private List<String> roomList;
+ /**鍖荤敓鏍囪瘑*/
+ private List<String> doctorIdList;
+ /**娉ㄥ皠绉戝尰鐢熸爣璇�*/
+ private List<String> zskDoctorIdList;
+ /**鐨偆绉戝尰鐢熸爣璇�*/
+ private List<String> pfkDoctorIdList;
+ /**浼氬憳绛夌骇*/
+ private List<String> userLevelList;
+ /**浼氬憳鐘舵��*/
+ private List<String> userStatusList;
+ /**澧為暱涓績鏄犲皠椤圭洰*/
+ private List<String> upProjectNameList;
+ /**椤鹃棶鏍囪瘑*/
+ private List<String> adviserIdList;
+ /**鏍囩*/
+ private List<String> tagNameList;
+ /**鎵ц棰戞,1,2,3(-1涓哄娆�)*/
+ private Integer deductionNum;
}
--
Gitblit v1.8.0