From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 15 ++++++++++++++-
1 files changed, 14 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..dc59145 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
@@ -12,6 +12,11 @@
@Data
@ToString
public class UserMoneyDto {
+
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize;
/**
* 鎿嶄綔浜虹被鍨�
*/
@@ -28,7 +33,10 @@
* 鎿嶄綔澶囨敞
*/
private String remarks;
-
+ /**
+ * 绫诲瀷(鏌ヨ绫诲瀷)
+ */
+ private Integer type;
/**
* 璁板綍绫诲瀷
*/
@@ -107,6 +115,11 @@
/* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
private Integer opType;
+ /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/
+ private Integer isReceiveValueAddedFund;
+
+ /**鏄惁棰嗗缓璧勯噾璁板綍 0 鍚� 1 鏄�*/
+ private Integer isHisRecord;
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
--
Gitblit v1.8.0