Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java

@@ -56,6 +56,10 @@
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody Long goodsSkuId,
                                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo2")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo2(@RequestBody String goodsSkuId,
                                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo1")
    R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -64,6 +68,10 @@
    R<?> updgoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                        @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-group-purchase/updgoodsGroupPurchaseInfo1")
    R<?> updgoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
                                   @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/goods-seckill/getGoodsSeckillOne")
    R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);