From 1468baceb9b0f168a76b999dcf9e724c49d100c8 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期五, 23 二月 2024 17:40:45 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 6 ++++++ 1 files changed, 6 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 a7127cf..75f6d2b 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 @@ -10,6 +10,8 @@ * */ @Data public class EmployeeReportDto { + /**鏍囪瘑*/ + private String id; /**鍛樺伐鏍囪瘑*/ private String employeeId; /**闂ㄥ簵鏍囪瘑*/ @@ -22,6 +24,10 @@ private List<String> employeeIdList; /**闂ㄥ簵鏍囪瘑闆嗗悎*/ private List<String> shopIdList; + /**鐢ㄦ埛鐘舵��*/ + List<String> userStatusList; + /**鏄惁鏌ヨVIP鐢ㄦ埛*/ + Integer selectVip; /**褰撳墠鏃堕棿*/ private String nowTime; /**寮�濮嬫椂闂�*/ -- Gitblit v1.8.0