From e4538a591ef58e33984e9e8209833d1243719e2e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 02 八月 2023 11:57:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-热门活动

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |   13 +++++++++++++
 1 files changed, 13 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 c374225..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
@@ -178,6 +178,9 @@
     /** 鐢ㄦ埛鍏磋叮鐖卞ソjson */
     private String userInterestsJson;
 
+    /** 绉戝鍏崇郴json */
+    private String departmentJson;
+
     /** email */
     private String email;
 
@@ -222,6 +225,11 @@
     /** 鎼滅储锛氬仛杩囬」鐩� */
     private String projectName;
 
+    /** 鍖荤敓id */
+    private String doctorId;
+    /** 閮ㄩ棬id */
+    private String department;
+
 
     /** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
     private String consumeStartTime;
@@ -229,6 +237,9 @@
     private String createStartTime;
     /** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙缁撴潫锛夛紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss */
     private String createEndTime;
+
+    public UserParamDto() {
+    }
 
     /**鎬у埆-鏈煡*/
     public static final Integer SEX_UNKNOWN = 0;
@@ -260,4 +271,6 @@
     //淇敼鎿嶄綔鐨勫娉�
     private String note;
 
+
+
 }

--
Gitblit v1.8.0