Merge remote-tracking branch 'origin/master'

liujie

2023-09-28 41c07e4558ed3a1cbdda0711f78cd3a812c06829

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


}