From f2a662b067f121188f2635719639b2bf2f6cfcfe Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 30 五月 2023 10:26:38 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 14 +++++++++-----
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java | 4 ++++
2 files changed, 13 insertions(+), 5 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 3e14371..a7893c9 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,14 +11,18 @@
@Data
public class ClinicPerfReqDto extends BaseQueryVo{
- //闂ㄥ簵id
+ /** 闂ㄥ簵id */
private String shopId;
- //寮�濮嬫椂闂�
+ /** 寮�濮嬫椂闂� */
private String startTime;
- //缁撴潫鏃堕棿
+ /** 缁撴潫鏃堕棿 */
private String endTime;
- //鍏抽敭璇�(鐢ㄦ埛鍚�/CIQ)
+ /** 鍏抽敭璇�(鐢ㄦ埛鍚�/CIQ) */
private String keyWord;
- //璁㈠崟鍙�
+ /** 璁㈠崟鍙� */
private String orderNo;
+ /** 鎿嶄綔浜烘爣璇� */
+ private String operatorId;
+ /** 鎿嶄綔浜� */
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
index 7f8ea9e..ab37d58 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
@@ -52,4 +52,8 @@
private String hisCorpUserId;
//鐧诲綍鍛樺伐鏍囪瘑
private String loginEmpId;
+ /** 鎿嶄綔浜烘爣璇� */
+ private String operatorId;
+ /** 鎿嶄綔浜� */
+ private String operatorName;
}
--
Gitblit v1.8.0