Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-10 d9bcc1f955e1cddc6a38e55f769205a9330d3c89

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.model.ShoppingCart;
import com.ruoyi.order.vo.*;
import com.ruoyi.model.ShoppingCart;

import java.util.List;

@@ -22,7 +22,7 @@
    * 添加商品
    * @param shoppingCart
    */
   void addGoods(ShoppingCart shoppingCart);
   Long addGoods(ShoppingCart shoppingCart);
   
   
   /**