Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 39ef464a6630a7b2ab99069e3f6bd40a99c48086

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.model.ShoppingCart;
import com.ruoyi.order.vo.*;
import model.ShoppingCart;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;