Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/CouponClient.java

@@ -14,6 +14,6 @@


    @PostMapping("/base/coupon/queryCouponListSearch")
    List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch);
    List<Map<String, Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch);

}