From 870bdaf5f69097395bc8c3e92863de096802573e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 25 七月 2023 16:14:01 +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 b5515d1..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
@@ -29,4 +29,8 @@
     private String endTime;
     /**绫诲瀷*/
     private Integer type;
+    /**鏄惁鏂颁細鍛�*/
+    private Integer isNewUser;
+    /**鏄惁棣栧ぉ*/
+    private Integer isBothOne;
 }

--
Gitblit v1.8.0