From 7e4852e4b12f5728e11e9c50caa96d3aba3786ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 13:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

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 5ca97ca..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
@@ -1,11 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
-import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.money.UserMoneyDto;
-import com.hz.his.dto.user.project.UserProjectDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,9 +37,16 @@
     Result unclaimedCancel(@RequestBody UserMoneyDto userMoneyDto);
 
 
+    /**
+     * 鑾峰彇鐢ㄦ埛璧勯噾淇℃伅
+     * */
+    @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