From 88ee15e7fa163d928525c71ca6504f23db751a57 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 16 五月 2023 14:45:12 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-prod-new-优惠券校验 --- phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 12 +++++++++++- 1 files changed, 11 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..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; /** * 璁板綍绫诲瀷 */ @@ -110,6 +118,8 @@ /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/ private Integer isReceiveValueAddedFund; + /**鏄惁棰嗗缓璧勯噾璁板綍 0 鍚� 1 鏄�*/ + private Integer isHisRecord; /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/ /** -- Gitblit v1.8.0