Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

 cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java

@@ -35,9 +35,9 @@
    List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType);


    PointDetailsVo queryRedemptionDetails(Integer detailsId);
    PointDetailsVo queryRedemptionDetails(Long detailsId);

    List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
    Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);


}