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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 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);

}