From 3de90089345a2bb8c18114885a8d7dcd58a432ce Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期日, 16 七月 2023 19:44:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index e3e91a5..5a20166 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -225,6 +225,11 @@
     /** 鎼滅储锛氬仛杩囬」鐩� */
     private String projectName;
 
+    /** 鍖荤敓id */
+    private String doctorId;
+    /** 閮ㄩ棬id */
+    private String department;
+
 
     /** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
     private String consumeStartTime;
@@ -266,4 +271,6 @@
     //淇敼鎿嶄綔鐨勫娉�
     private String note;
 
+
+
 }

--
Gitblit v1.8.0