From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001 From: luo <2855143437@qq.com> Date: 星期日, 08 十月 2023 16:19:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java | 2 ++ 1 files changed, 2 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 764cd43..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 @@ -22,6 +22,8 @@ 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); -- Gitblit v1.7.1