Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-06 2b4511ca363e74343e1cb678c23a9e7638800a3f

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

@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-activity")
public interface MerChandiseClient {

    @PostMapping("/pointMerchars/convertGoods")
    @PostMapping("/base/pointMerchars/convertGoods")
    public List<IntegralCommodity> getConvertibleGoods();