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 | 22 +++++++++++++++++++++-
1 files changed, 21 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 deaa482..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;
/**
* 璁板綍绫诲瀷
*/
@@ -107,6 +117,16 @@
/* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
private Integer opType;
+ /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/
+ private Integer isReceiveValueAddedFund;
+
+ /**鏄惁棰嗗缓璧勯噾璁板綍 0 鍚� 1 鏄�*/
+ private Integer isHisRecord;
+ /**鏌ヨ涓嶅彲棰嗗彇鍘熷洜*/
+ private Integer isSelectNotUse = 0;
+
+ /**寰呴鍙栬褰曟爣璇嗛泦鍚�*/
+ private List<String> receiveIdList;
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
--
Gitblit v1.8.0