Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-13 36dd5e7edf18d0ab0e0d57ed960bdbd8aa770c40

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java

@@ -169,7 +169,7 @@
   @GetMapping("/getGoodsPrice")
   public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId){
      AppUser appUser = appUserClient.getAppUserById(appUserId);
      Price price = shoppingCartService.getPrice(appUser, goodsId, shopId);
      Price price = shoppingCartService.getPrice(appUser, goodsId, 1, shopId);
      return R.ok(price);
   }