Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 8cdadf81127b9d34a54d250a3abc878a8d5339c5

 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;