Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-24 dc72b94ed88585df5d49a90a39f723cd0364bb6d

 crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java

@@ -21,4 +21,11 @@

    @PostMapping(value = "/user/getUserOpRecord")
    Result getUserOpRecord( @RequestBody(required = false) UserDto userDto);

    @PostMapping(value = "/user/unbindingPhis")
    Result unbindingPhis( @RequestBody(required = false) UserDto userDto);

    /**合并账号*/
    @PostMapping(value = "/user/merge/accounts")
    Result mergeAccounts( @RequestBody UserDto userDto);
}