From d9941dab703ba76b0cae50834ae6e35c19cef329 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 16 五月 2023 14:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |   11 +++++++++++
 1 files changed, 11 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 8bcff06..c374225 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
@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -12,6 +13,7 @@
  * @author wzh
  */
 @Data
+@ToString
 public class UserParamDto {
 
     /** 鐢ㄦ埛id */
@@ -249,4 +251,13 @@
     /*鍚屾棰嗗缓鐨勫弬鏁�*/
     private boolean internal;
 
+    //淇敼鎿嶄綔浜哄悕绉�
+    private String opMan;
+
+    //淇敼鎿嶄綔浜烘爣璇�
+    private String opId;
+
+    //淇敼鎿嶄綔鐨勫娉�
+    private String note;
+
 }

--
Gitblit v1.8.0