From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index d70d3bb..0ff5a5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -4,6 +4,8 @@
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.List;
+
 /**
  * 鐢ㄦ埛璧勯噾
  *
@@ -12,6 +14,11 @@
 @Data
 @ToString
 public class UserMoneyDto {
+
+    /**褰撳墠椤垫暟*/
+    private Integer pageNum;
+    /**褰撳墠椤垫樉绀烘潯鏁�*/
+    private Integer pageSize;
     /**
      * 鎿嶄綔浜虹被鍨�
      */
@@ -28,7 +35,10 @@
      * 鎿嶄綔澶囨敞
      */
     private String remarks;
-
+    /**
+     * 绫诲瀷(鏌ヨ绫诲瀷)
+     */
+    private Integer type;
     /**
      * 璁板綍绫诲瀷
      */
@@ -110,6 +120,13 @@
     /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄�  榛樿闇�瑕侀鍙�*/
     private Integer isReceiveValueAddedFund;
 
+    /**鏄惁棰嗗缓璧勯噾璁板綍 0 鍚� 1 鏄�*/
+    private Integer isHisRecord;
+    /**鏌ヨ涓嶅彲棰嗗彇鍘熷洜*/
+    private Integer isSelectNotUse = 0;
+
+    /**寰呴鍙栬褰曟爣璇嗛泦鍚�*/
+    private List<String> receiveIdList;
 
     /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
     /**

--
Gitblit v1.8.0