From c76e8c849181d237cd5825da085b07eb8088a7c9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 17:43:02 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java |    1 +
 1 files changed, 1 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 928ce41..b5515d1 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;
     /**鍛樺伐鏍囪瘑闆嗗悎*/

--
Gitblit v1.8.0