From 779e389ea595cf3c94dfb2ce6832954a0a37bb89 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 07 九月 2022 18:33:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 926de3e..85d1234 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -38,8 +38,8 @@
}
public Integer getPageSize() {
- if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
- this.pageSize = 500;
+ if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
+ this.pageSize = 800;
}
return this.pageSize;
}
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..d70d3bb 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
@@ -107,6 +107,9 @@
/* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
private Integer opType;
+ /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/
+ private Integer isReceiveValueAddedFund;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index 5c73e16..d601adf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -42,4 +42,11 @@
* */
@PostMapping(value = "/user/money/info")
Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+
+ /**
+ * 璁剧疆澧炲�奸噾鏄惁闇�瑕佺敤鎴烽鍙栫姸鎬�
+ * */
+ @PostMapping(value = "/user/money/unclaimed/default/setting")
+ Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
}
\ No newline at end of file
--
Gitblit v1.8.0