Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 84caf250d5638279d45f32af13ddd346bed2e0a4

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

@@ -1,9 +1,9 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderVO;
import model.Order;

import java.util.List;