From 45f8aca8f80c325447d5deeec98d35fd4fb0ede3 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 17 八月 2023 18:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-顾问打分' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 5 +++++
1 files changed, 5 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..afef51e 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;
/**鍛樺伐鏍囪瘑闆嗗悎*/
@@ -28,4 +29,8 @@
private String endTime;
/**绫诲瀷*/
private Integer type;
+ /**鏄惁鏂颁細鍛�*/
+ private Integer isNewUser;
+ /**鏄惁棣栧ぉ*/
+ private Integer isBothOne;
}
--
Gitblit v1.8.0