Merge remote-tracking branch 'origin/master'

44323

2023-09-26 7aa9607492e2c0b70838c53083f5362e49e74f44

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java

@@ -33,7 +33,7 @@
    ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);

    @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
    public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
    public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);

    @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
    public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);