From ead1649e86e946126137ef523c508bb4c7dfff90 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 22 五月 2023 10:34:26 +0800
Subject: [PATCH] Merge branch '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