Merge remote-tracking branch 'origin/master'

fwq

2022-09-07 779e389ea595cf3c94dfb2ce6832954a0a37bb89

Merge remote-tracking branch 'origin/master'

 phis-feign/src/main/java/com/hz/his/dto/PageDto.java

@@ -38,8 +38,8 @@
    }

    public Integer getPageSize() {
        if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
            this.pageSize = 500;
        if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
            this.pageSize = 800;
        }
        return this.pageSize;
    }

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

@@ -107,6 +107,9 @@
    /* 操作类型 是否需要领取 默认 只有增值金 添加需要领取系统处理 0 用户领取 1*/
    private Integer opType;

    /*是否需要领取 0 否 1 是  默认需要领取*/
    private Integer isReceiveValueAddedFund;


    /*****************类型信息 注：以下常量以phis的UserMoneyLog常量为主*******************************/
    /**

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

@@ -42,4 +42,11 @@
     * */
    @PostMapping(value = "/user/money/info")
    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);


    /**
     * 设置增值金是否需要用户领取状态
     * */
    @PostMapping(value = "/user/money/unclaimed/default/setting")
    Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
}