Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-04 79e82d188a24ad92395ac4b39c1a49266a647c3f

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

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.vo.OrderVO;
import model.Order;
import com.ruoyi.order.model.Order;

import java.util.List;