Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -2,6 +2,11 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
import com.dsh.activity.model.request.PointMercharsPayedVo;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -13,4 +18,6 @@
 */
public interface UserPointsMerchandiseService extends IService<UserPointsMerchandise> {

    List<PointMerchandiseIncomeVo> getAmount();

}