From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
index 21ca434..6589158 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
@@ -63,4 +63,11 @@
     @PostMapping("/base/pointMerchars/writeOffGoodsStatus")
     boolean writeOffGoodsStatus(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/base/pointMerchars/getIntegralGoodsListOfSearchAudit")
+    List<Map<String,Object>>  getIntegralGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch);
+
+    @PostMapping("/base/pointMerchars/updateType")
+    Object updateType(String s);
+
+
 }

--
Gitblit v1.7.1