From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java |    6 +++++-
 1 files changed, 5 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 a028077..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
@@ -20,8 +20,12 @@
 
     List<Map<String, Object>> queryGoodsListOfSearch(IntegralGoodsOfSearch ofSearch);
 
+    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