From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java
index 2169a65..4c7adc5 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.activity.entity.PointsMerchandise;
+import com.dsh.activity.model.CoachChangeStateVO;
 import com.dsh.activity.model.request.IntegralGoodsOfSearch;
 
 import java.util.List;
@@ -23,4 +24,8 @@
 
     List<Map<String, Object>> queryGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch);
 
+    List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch);
+
+    Object changeState(CoachChangeStateVO dto);
+
 }

--
Gitblit v1.7.1