Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

 cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java

@@ -1,6 +1,8 @@
package com.dsh.activity.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.BillingDataRequestVo;
import com.dsh.activity.entity.ConsumeDetail;
import com.dsh.activity.entity.CourseChangeStateDTO;
import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
@@ -22,4 +24,6 @@
    List<PointMerchandiseIncomeVo> getAmount();

    Object changeState(CourseChangeStateDTO dto);

    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);
}