Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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