From b2ad4b914ccaf0c22e382855d18d9bca64f016aa Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 11 四月 2024 11:50:54 +0800
Subject: [PATCH] Merge branch 'fhx-prod-智能导诊' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java
index d16d6f0..623c24d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java
@@ -25,4 +25,6 @@
     private String operatorName;
     /**鎿嶄綔鏃堕棿-yyyy-MM-dd HH:mm:ss*/
     private String opTime;
+    /**鎿嶄綔澶囨敞*/
+    private String opRemarks;
 }

--
Gitblit v1.8.0