Merge remote-tracking branch 'origin/master'

liujie

2023-09-27 4146ce356365a67fec0509d64ebcf52f74c7ade9

 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);


}