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/money/UserMoneyUpdateDto.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 9379a3b..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
@@ -2,9 +2,6 @@
 
 
 import lombok.Data;
-import lombok.ToString;
-
-import java.math.BigDecimal;
 
 /**
  * 淇敼鐢ㄦ埛璧勯噾
@@ -50,6 +47,9 @@
     /**澶囨敞*/
     private String remarks;
 
+    /**閲戦瑙勫垯*/
+    private String moneyRuleId;
+
     /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
 
     /**鎿嶄綔浜虹被鍨�-绯荤粺*/

--
Gitblit v1.8.0