From 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 06 七月 2023 12:19:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 15 +++++++++++++++
1 files changed, 15 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 48ae9e3..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;
@@ -257,5 +268,9 @@
//淇敼鎿嶄綔浜烘爣璇�
private String opId;
+ //淇敼鎿嶄綔鐨勫娉�
+ private String note;
+
+
}
--
Gitblit v1.8.0