From 81ab3d0067133df70bcf881bba75af08112fa90d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 七月 2024 19:22:19 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index 9fd2c62..fbb3a0d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -1,10 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.user.money.PhisUserMoneyDto;
-import com.hz.his.dto.user.money.UserMoneyDto;
-import com.hz.his.dto.user.money.UserMoneyUpdateDto;
-import com.hz.his.dto.user.money.UserTurnDto;
+import com.hz.his.dto.user.money.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,7 +9,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-money")
+@FeignClient(name="phi-platform-user",path = "/phip",contextId = "phip-user-money")
 public interface SPhipUserMoneyService {
 
     /**
@@ -28,6 +25,13 @@
     Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
 
     /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼-澶氭潯
+     */
+    @PostMapping(value = "/user/money/unclaimed/add/list")
+    Result userMoneyUpdateList(@RequestBody UserMoneyListDto userMoneyListDto);
+
+
+    /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
      */
     @PostMapping(value = "/user/money/info")

--
Gitblit v1.8.0