From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 764cd43..cb26606 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
@@ -22,8 +22,10 @@
void saveCity(Integer id, String province, String provinceCode, String city, String cityCode);
+ List<Map<String, Object>> queryGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch);
+
List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch);
- Object changeState(CoachChangeStateVO dto);
+ void changeState(CoachChangeStateVO dto);
}
--
Gitblit v1.7.1