Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-06-12 7c7413c4353fb0acc312b8631267117b4770f048

 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;
@@ -49,4 +50,10 @@
     * */
    @PostMapping(value = "/user/money/unclaimed/default/setting")
    Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);

    /**
     * 用户资金使用记录列表
     * */
    @PostMapping(value = "/user/money/use/log/list")
    Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
}