Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-31 c743f4413a00fc063bbbd9d851b6d0c3fff10581

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

@@ -4,7 +4,7 @@
import com.dsh.account.entity.UserIntegralChanges;
import com.dsh.account.model.SaveUserIntegralChangesVo;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
import com.dsh.account.model.vo.userBenefitDetail.IntegralDetailsResponse;
import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;

import java.util.List;
@@ -19,7 +19,7 @@
 */
public interface UserIntegralChangesService extends IService<UserIntegralChanges> {

    IntegralDetailsResponse queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);
    List<IntegralsData> queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);


    /**