From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 3faa1ea..5185c39 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -33,14 +33,17 @@
/**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/
private int opType;
- /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/
+ /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�),濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栫殑閲戦鍏宠仈鏁版嵁涔熷瓨鍦ㄨ繖*/
private String commonId;
- /**璁㈠崟id*/
+ /**璁㈠崟id,濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栭噾棰濆瓨鐨勬槸鏈悓姝ヨ繃鏉ョ殑鍗曟爣璇�*/
private String orderId;
/**瀛愬崟璁㈠崟id*/
private String orderItemId;
+ /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌UserMoneyReturnVo杩斿洖璇ヤ紶鍊�*/
+ private String equId;
+
/**澶囨敞*/
private String remarks;
--
Gitblit v1.8.0