From fcbe29760373012bae67ef8d95b587158df72304 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期六, 06 五月 2023 16:02:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
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