From dcb236bde4a1c2c9723790217b7bc8f199daa710 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 28 四月 2023 14:55:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new-优惠券校验' into master-test

---
 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 10da103..5f34e81 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
@@ -12,6 +12,10 @@
 public class EmployeeReportDto {
     /**鍛樺伐鏍囪瘑*/
     private String employeeId;
+    /**闂ㄥ簵鏍囪瘑*/
+    private String shopId;
+    /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+    private String roleStr;
     /**鍛樺伐鏍囪瘑闆嗗悎*/
     private List<String> employeeIdList;
     /**闂ㄥ簵鏍囪瘑闆嗗悎*/

--
Gitblit v1.8.0