Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 fd2823afc771def7f9ea1f09d9c38ea8086aa395

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/ShoppingCartMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import model.ShoppingCart;
import com.ruoyi.order.model.ShoppingCart;

public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {