Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-10 fcabbb78c0158b4417f89475935f0f36f58f0d87

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -1055,7 +1055,7 @@
            this.removeBatchByIds(ids);
         }
      }
      return R.ok();
      return R.ok(order.getId().toString());
   }