Merge branch 'master-prod-new' into master-test

fwq

2024-04-10 dcbd4887da027b5b4afb53c5b270c86361e684e7

Merge branch 'master-prod-new' into master-test

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java

@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.ToString;

import java.util.List;

/**
 * 用户资金
 *
@@ -123,6 +125,9 @@
    /**查询不可领取原因*/
    private Integer isSelectNotUse = 0;

    /**待领取记录标识集合*/
    private List<String> receiveIdList;

    /*****************类型信息 注：以下常量以phis的UserMoneyLog常量为主*******************************/
    /**
     * 应用类型-第三方平台

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java

@@ -32,6 +32,12 @@
    Result receive(@RequestBody UserMoneyDto userMoneyDto);

    /**
     * 开放平台-领取用户资产-多条
     */
    @PostMapping(value = "/user/money/unclaimed/receive/more")
    Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);

    /**
     * 开放平台-作废用户待领取记录
     */
    @PostMapping(value = "/user/money/unclaimed/cancel")