From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java
index d29fe97..d762036 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java
@@ -13,6 +13,8 @@
     private String userId;
     /**瀛愯鍗曠紪鍙�*/
     private String orderItemNo;
+    /**鍗″寘鏍囪瘑*/
+    private String cardId;
 
 }
 

--
Gitblit v1.8.0