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/mapper/PointsMerchandiseMapper.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
index cfb3782..49248dd 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.activity.entity.PointsMerchandise;
+import com.dsh.activity.model.CoachChangeStateVO;
+import com.dsh.activity.model.request.IntegralGoodsOfSearch;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -33,6 +35,9 @@
@Param("state") Integer state,
@Param("page") Page<Map<String, Object>> page);
+ List<Map<String, Object>> ticketList(@Param("query") IntegralGoodsOfSearch ofSearch);
+
+ int changeState(@Param("query") CoachChangeStateVO dto);
void saveCity(@Param("id") Integer id, @Param("province") String province, @Param("provinceCode") String provinceCode, @Param("city") String city, @Param("cityCode") String cityCode);
--
Gitblit v1.7.1