From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 5c73e16..2453e21 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,5 +1,6 @@
 package com.hz.his.feign.service.platform;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hx.resultTool.Result;
 import com.hz.his.dto.user.money.UserMoneyDto;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -42,4 +43,17 @@
      * */
     @PostMapping(value = "/user/money/info")
     Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+
+    /**
+     * 璁剧疆澧炲�奸噾鏄惁闇�瑕佺敤鎴烽鍙栫姸鎬�
+     * */
+    @PostMapping(value = "/user/money/unclaimed/default/setting")
+    Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 鐢ㄦ埛璧勯噾浣跨敤璁板綍鍒楄〃
+     * */
+    @PostMapping(value = "/user/money/use/log/list")
+    Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0