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/impl/PointsMerchandiseServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
index 6680cea..e0c9309 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.activity.entity.PointsMerchandise;
 import com.dsh.activity.mapper.PointsMerchandiseMapper;
+import com.dsh.activity.model.CoachChangeStateVO;
 import com.dsh.activity.model.request.IntegralGoodsOfSearch;
 import com.dsh.activity.service.PointsMerchandiseService;
 import org.springframework.stereotype.Service;
@@ -37,4 +38,14 @@
     public void saveCity(Integer id, String province, String provinceCode, String city, String cityCode) {
         this.baseMapper.saveCity(id,province,provinceCode,city,cityCode);
     }
+
+    @Override
+    public List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch) {
+        return this.baseMapper.ticketList(ofSearch);
+    }
+
+    @Override
+    public Object changeState(CoachChangeStateVO dto) {
+        return this.baseMapper.changeState(dto);
+    }
 }

--
Gitblit v1.7.1