From b0f290df690b64c9d96458a7a5a5f836ed338689 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 23 八月 2023 17:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index d33f678..500b7d8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
@@ -35,4 +36,7 @@
private Integer isBothOne;
/**宸ヤ綔鏃�*/
private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
}
--
Gitblit v1.8.0